iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3313da8188
linux/arch/m68k
History
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
..
68000 m68k: Fix off-by-one calendar month 2018-05-22 10:31:50 +02:00
amiga treewide: Switch DEFINE_TIMER callbacks to struct timer_list * 2017-11-21 15:57:05 -08:00
apollo m68k: Remove unused set_clock_mmss() helpers 2018-07-29 10:48:18 +02:00
atari mm: remove include/linux/bootmem.h 2018-10-31 08:54:16 -07:00
bvme6000 m68k: Remove unused set_clock_mmss() helpers 2018-07-29 10:48:18 +02:00
coldfire net: phy: fixed-phy: Drop GPIO from fixed_phy_add() 2019-02-04 18:33:36 -08:00
configs m68k/defconfig: Update defconfigs for v4.20-rc1 2018-12-03 13:12:36 +01:00
emu m68k: set proper major_num when specifying module param major_num 2019-02-06 12:50:40 -07:00
fpsp040 License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
hp300 License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ifpsp060 scripts/spelling.txt: add regsiter -> register spelling mistake 2017-05-08 17:15:13 -07:00
include arch: unexport asm/shmparam.h for all architectures 2019-02-01 15:46:22 -08:00
kernel Remove 'type' argument from access_ok() function 2019-01-03 18:57:57 -08:00
lib License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mac m68k/mac: Switch to use %ptR 2018-12-10 22:40:16 +01:00
math-emu m68k: Assorted spelling fixes 2016-07-03 14:05:28 +02:00
mm m68k fixes for 4.20 2018-12-20 07:35:16 -08:00
mvme16x m68k: Remove unused set_clock_mmss() helpers 2018-07-29 10:48:18 +02:00
mvme147 m68k: Remove unused set_clock_mmss() helpers 2018-07-29 10:48:18 +02:00
q40 m68k: Remove unused set_clock_mmss() helpers 2018-07-29 10:48:18 +02:00
sun3 memblock: stop using implicit alignment to SMP_CACHE_BYTES 2018-10-31 08:54:16 -07:00
sun3x mm: remove include/linux/bootmem.h 2018-10-31 08:54:16 -07:00
tools/amiga License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
install.sh
Kconfig Kconfig updates for v4.21 2018-12-29 13:03:29 -08:00
Kconfig.bus pcmcia: allow PCMCIA support independent of the architecture 2018-11-23 11:46:00 +09:00
Kconfig.cpu PCI: consolidate PCI config entry in drivers/pci 2018-11-23 11:45:34 +09:00
Kconfig.debug Kconfig: consolidate the "Kernel hacking" menu 2018-08-02 08:06:48 +09:00
Kconfig.devices License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Kconfig.machine m68k: Remove redundant 'default n' from Kconfig 2018-12-03 13:05:42 +01:00
Makefile m68k: Generate uapi header and syscall table header files 2018-12-04 09:47:55 +01:00