David S. Miller
3313da8188
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
The netfilter conflicts were rather simple overlapping
changes.
However, the cls_tcindex.c stuff was a bit more complex.
On the 'net' side, Cong is fixing several races and memory
leaks. Whilst on the 'net-next' side we have Vlad adding
the rtnl-ness support.
What I've decided to do, in order to resolve this, is revert the
conversion over to using a workqueue that Cong did, bringing us back
to pure RCU. I did it this way because I believe that either Cong's
races don't apply with have Vlad did things, or Cong will have to
implement the race fix slightly differently.
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-02-15 12:38:38 -08:00
..
alpha
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-02-15 12:38:38 -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-15 12:38:38 -08:00
arm64
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-02-15 12:38:38 -08:00
c6x
arch: unexport asm/shmparam.h for all architectures
2019-02-01 15:46:22 -08:00
csky
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-15 12:38:38 -08:00
microblaze
arch: unexport asm/shmparam.h for all architectures
2019-02-01 15:46:22 -08:00
mips
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-02-15 12:38:38 -08:00
nds32
nds32: remove unneeded code in arch/nds32/Makefile
2019-01-17 23:42:37 +09:00
nios2
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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-02-15 12:38:38 -08:00
riscv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-02-15 12:38:38 -08:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-02-15 12:38:38 -08:00
sh
sparc
socket: fix for Add SO_TIMESTAMP[NS]_NEW
2019-02-03 20:36:11 -08:00
um
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-15 12:38:38 -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