linux/arch/alpha
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
..
boot kbuild: Rename HOSTCFLAGS to KBUILD_HOSTCFLAGS 2018-07-18 01:18:05 +09:00
include Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-15 12:38:38 -08:00
kernel Remove 'type' argument from access_ok() function 2019-01-03 18:57:57 -08:00
lib Remove 'type' argument from access_ok() function 2019-01-03 18:57:57 -08:00
math-emu License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mm alpha: fix page fault handling for r16-r18 targets 2019-02-10 20:42:23 -08:00
oprofile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Kconfig Kconfig file consolidation for v4.21 2018-12-29 13:40:29 -08:00
Kconfig.debug Kconfig: consolidate the "Kernel hacking" menu 2018-08-02 08:06:48 +09:00
Makefile alpha: generate uapi header and syscall table header files 2018-12-21 11:57:56 -05:00
defconfig alpha: defconfig: Cleanup from old Kconfig options 2017-09-04 12:04:33 -07:00