Craig Gallek d296ba60d8 soreuseport: Resolve merge conflict for v4/v6 ordering fix ... d894ba18d4 ("soreuseport: fix ordering for mixed v4/v6 sockets") was merged as a bug fix to the net tree. Two conflicting changes were committed to net-next before the above fix was merged back to net-next: ca065d0cf8 ("udp: no longer use SLAB_DESTROY_BY_RCU") 3b24d854cb ("tcp/dccp: do not touch listener sk_refcnt under synflood") These changes switched the datastructure used for TCP and UDP sockets from hlist_nulls to hlist. This patch applies the necessary parts of the net tree fix to net-next which were not automatic as part of the merge. Fixes: 1602f49b58 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") Signed-off-by: Craig Gallek <kraig@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-25 13:27:54 -04:00
..
acpi
asm-generic	arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections	2016-03-25 16:37:42 -07:00
clocksource
crypto	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-03-17 11:33:45 -07:00
drm	drm/ttm: use phys_addr_t for ttm_bus_placement	2016-04-04 17:00:01 -04:00
dt-bindings	The clk changes for this release cycle are mostly dominated by	2016-03-23 06:06:45 -07:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2016-04-24 00:12:08 -04:00
math-emu
media	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2016-03-19 16:31:54 -07:00
memory
misc
net	soreuseport: Resolve merge conflict for v4/v6 ordering fix	2016-04-25 13:27:54 -04:00
pcmcia
ras
rdma	Round two of 4.6 merge window patches	2016-03-22 15:48:44 -07:00
rxrpc	rxrpc: Static arrays of strings should be const char *const[]	2016-04-11 15:34:40 -04:00
scsi	Merge branch 'fixes-base' into fixes	2016-04-05 06:56:47 -04:00
soc	IOMMU Updates for Linux v4.6	2016-03-22 11:57:43 -07:00
sound
target	target: add a new add_wwn_groups fabrics method	2016-03-30 20:06:44 -07:00
trace	perf, bpf: minimize the size of perf_trace_() tracepoint handler	2016-04-21 13:48:20 -04:00
uapi	xfrm: align nlattr properly when needed	2016-04-23 20:13:25 -04:00
video	gpu: ipu-v3: ipu-dmfc: Rename ipu_dmfc_init_channel to ipu_dmfc_config_wait4eot	2016-03-31 11:24:33 +02:00
xen
Kbuild