David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
alpha	sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW	2019-02-03 11:17:31 -08:00
arc	ARCv2: lib: memeset: fix doing prefetchw outside of buffer	2019-01-17 16:24:39 -08:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
c6x	arch: unexport asm/shmparam.h for all architectures	2019-02-01 15:46:22 -08:00
csky	csky: fixup compile error with CPU 810.	2019-01-10 04:37:37 -08:00
h8300	arch: unexport asm/shmparam.h for all architectures	2019-02-01 15:46:22 -08:00
hexagon	arch: unexport asm/shmparam.h for all architectures	2019-02-01 15:46:22 -08:00
ia64	arch: Use asm-generic/socket.h when possible	2019-02-03 11:17:30 -08:00
m68k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
microblaze	arch: unexport asm/shmparam.h for all architectures	2019-02-01 15:46:22 -08:00
mips	net: phy: fixed-phy: Drop GPIO from fixed_phy_add()	2019-02-04 18:33:36 -08:00
nds32	nds32: remove unneeded code in arch/nds32/Makefile	2019-01-17 23:42:37 +09:00
nios2	arch: remove redundant UAPI generic-y defines	2019-01-06 10:22:15 +09:00
openrisc	arch: unexport asm/shmparam.h for all architectures	2019-02-01 15:46:22 -08:00
parisc	sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW	2019-02-03 11:17:31 -08:00
powerpc	socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes	2019-02-03 11:17:31 -08:00
riscv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
s390	s390/net: move pnet constants	2019-02-07 18:06:18 -08:00
sh	Kbuild late updates for v4.21	2019-01-06 16:33:10 -08:00
sparc	socket: fix for Add SO_TIMESTAMP[NS]_NEW	2019-02-03 20:36:11 -08:00
um	Merge branch 'akpm' (patches from Andrew)	2019-01-05 09:16:18 -08:00
unicore32	arch: unexport asm/shmparam.h for all architectures	2019-02-01 15:46:22 -08:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
.gitignore
Kconfig	jump_label: move 'asm goto' support test to Kconfig	2019-01-06 09:46:51 +09:00