leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56dd18a49f
linux/arch/arm
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
..
boot Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-15 12:38:38 -08:00
common Included in this update: 2019-01-05 11:23:17 -08:00
configs ARM: SoC: late updates 2019-01-05 11:30:37 -08:00
crypto Kbuild updates for v4.21 2018-12-29 12:03:17 -08:00
firmware
include arm64/xen: fix xen-swiotlb cache flushing 2019-01-23 22:14:56 +01:00
kernel jump_label: move 'asm goto' support test to Kconfig 2019-01-06 09:46:51 +09:00
kvm Kconfig updates for v4.21 2018-12-29 13:03:29 -08:00
lib
mach-actions
mach-alpine
mach-artpec
mach-asm9260
mach-aspeed
mach-at91 treewide: add intermediate .s files to targets 2018-12-23 10:12:08 +09:00
mach-axxia
mach-bcm ARM: SoC platform updates 2018-12-31 17:27:54 -08:00
mach-berlin
mach-clps711x
mach-cns3xxx ARM: cns3xxx: Use actual size reads for PCIe 2019-01-31 15:07:16 -06:00
mach-davinci ARM: davinci: omapl138-hawk: fix label names in GPIO lookup entries 2019-01-10 13:32:51 +05:30
mach-digicolor
mach-dove
mach-ebsa110
mach-efm32
mach-ep93xx mmc: spi: Convert to use GPIO descriptors 2018-12-17 08:26:24 +01:00
mach-exynos
mach-footbridge
mach-gemini
mach-highbank
mach-hisi
mach-imx ARM: SoC platform updates 2018-12-31 17:27:54 -08:00
mach-integrator ARM: integrator: impd1: use struct_size() in devm_kzalloc() 2019-01-11 13:33:00 +01:00
mach-iop13xx
mach-iop32x ARM: iop32x/n2100: fix PCI IRQ mapping 2019-01-30 11:34:42 +01:00
mach-iop33x
mach-ixp4xx
mach-keystone
mach-ks8695 ARM: SoC platform updates 2018-12-31 17:27:54 -08:00
mach-lpc18xx
mach-lpc32xx
mach-mediatek
mach-meson ARM: meson: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER 2018-12-10 12:43:40 -08:00
mach-mmp ARM: Device-tree updates 2018-12-31 17:36:02 -08:00
mach-moxart
mach-mv78xx0
mach-mvebu
mach-mxs
mach-netx
mach-nomadik
mach-npcm
mach-nspire
mach-omap1 ARM: SoC platform updates 2018-12-31 17:27:54 -08:00
mach-omap2 Included in this update: 2019-01-05 11:23:17 -08:00
mach-orion5x ARM: orion5x: Include platform_data/dsa.h 2019-01-17 11:31:24 -08:00
mach-oxnas
mach-picoxcell
mach-prima2
mach-pxa Included in this update: 2019-01-05 11:23:17 -08:00
mach-qcom
mach-rda ARM: Prepare RDA8810PL SoC 2018-12-31 13:09:39 -08:00
mach-realview ARM: vexpress/realview: consolidate immitation CPU hotplug 2018-12-14 14:44:59 +00:00
mach-rockchip
mach-rpc
mach-s3c24xx mmc: s3cmci: Use the slot GPIO descriptor 2018-12-17 08:26:24 +01:00
mach-s3c64xx
mach-s5pv210
mach-sa1100 Included in this update: 2019-01-05 11:23:17 -08:00
mach-shmobile
mach-socfpga reset: socfpga: add an early reset driver for SoCFPGA 2019-01-07 16:38:50 +01:00
mach-spear
mach-sti ARM: sti: remove pen_release and boot_lock 2018-12-20 14:32:15 +01:00
mach-stm32
mach-sunxi ARM: sunxi: add Allwinner ARMv5 SoCs 2018-12-03 09:57:59 +01:00
mach-tango ARM: tango: Improve ARCH_MULTIPLATFORM compatibility 2019-01-30 11:45:10 +01:00
mach-tegra ARM: tegra: avoid section mismatch warning 2018-12-12 13:57:55 -08:00
mach-u300
mach-uniphier
mach-ux500
mach-versatile
mach-vexpress ARM: vexpress/realview: consolidate immitation CPU hotplug 2018-12-14 14:44:59 +00:00
mach-vt8500
mach-w90x900
mach-zx
mach-zynq
mm Included in this update: 2019-01-05 11:23:17 -08:00
net arm: bpf: implement jitting of JMP32 2019-01-26 13:33:02 -08:00
nwfpe
oprofile Remove 'type' argument from access_ok() function 2019-01-03 18:57:57 -08:00
plat-iop
plat-omap
plat-orion ARM: orion5x: Include platform_data/dsa.h 2019-01-17 11:31:24 -08:00
plat-pxa ARM: pxa: ssp: unneeded to free devm_ allocated data 2019-01-23 21:32:01 +01:00
plat-samsung
plat-versatile ARM: versatile: rename and comment SMP implementation 2018-12-14 14:44:59 +00:00
probes
tools kbuild: remove redundant target cleaning on failure 2019-01-06 09:46:51 +09:00
vdso
vfp Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus 2019-01-02 10:37:05 +00:00
xen arch/arm/xen: Remove duplicate header 2019-01-28 17:42:20 -05:00
Kconfig ARM: SoC: late updates 2019-01-05 11:30:37 -08:00
Kconfig-nommu
Kconfig.debug i.MX SoC changes for 4.21: 2018-12-12 13:52:48 -08:00
Makefile ARM: SoC: late updates 2019-01-05 11:30:37 -08:00