David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
alpha
arc
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
c6x
h8300
hexagon	hexagon: export csum_partial_copy_nocheck	2018-05-01 15:49:50 -05:00
ia64
m68k
microblaze
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
nds32
nios2
openrisc
parisc	parisc: Move setup_profiling_timer() out of init section	2018-05-18 16:21:49 +02:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
riscv	RISC-V: build vdso-dummy.o with -no-pie	2018-04-24 10:54:46 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
sh	sh: switch to NO_BOOTMEM	2018-05-11 13:35:46 -04:00
sparc	bpf, sparc: remove unused variable	2018-05-14 19:11:45 -07:00
um
unicore32
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
xtensa
.gitignore
Kconfig	KASAN: prohibit KASAN+STRUCTLEAK combination	2018-05-11 17:28:45 -07:00