iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
David S. Miller fba961ab29 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Lots of overlapping changes.  Also on the net-next side
the XDP state management is handled more in the generic
layers so undo the 'net' nfp fix which isn't applicable
in net-next.

Include a necessary change by Jakub Kicinski, with log message:

====================
cls_bpf no longer takes care of offload tracking.  Make sure
netdevsim performs necessary checks.  This fixes a warning
caused by TC trying to remove a filter it has not added.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-12-22 11:16:31 -05:00
..
boot
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-12-16 22:11:55 -05:00
common
Merge branch 'pm-sleep'
2017-11-13 01:41:20 +01:00
configs
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
crypto
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
firmware
…
include
KVM fixes for v4.15-rc3
2017-12-10 08:24:16 -08:00
kernel
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
2017-12-03 10:51:08 -05:00
kvm
GICv4 Support for KVM/ARM for v4.15
2017-11-17 13:20:01 +01:00
lib
ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch
2017-12-17 22:20:39 +00:00
mach-actions
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-alpine
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-artpec
…
mach-asm9260
…
mach-aspeed
…
mach-at91
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-axxia
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-bcm
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-berlin
…
mach-clps711x
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-cns3xxx
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-davinci
ARM: Device-tree updates for 4.15
2017-11-16 15:48:26 -08:00
mach-digicolor
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-dove
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-ebsa110
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-efm32
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-ep93xx
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-exynos
ARM: EXYNOS: Remove Exynos4212 related dead code
2017-10-08 13:52:09 +02:00
mach-footbridge
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-11-13 17:56:58 -08:00
mach-gemini
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-highbank
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-hisi
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-imx
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-integrator
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-iop13xx
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-iop32x
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
mach-iop33x
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-ixp4xx
treewide: Switch DEFINE_TIMER callbacks to struct timer_list *
2017-11-21 15:57:05 -08:00
mach-keystone
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-ks8695
Merge branch 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2017-11-14 17:52:21 -08:00
mach-lpc18xx
…
mach-lpc32xx
…
mach-mediatek
ARM: mediatek: Cocci spatch "of_table"
2017-10-13 16:56:55 +02:00
mach-meson
ARM: meson: fix spelling mistake: "Couln't" -> "Couldn't"
2017-11-30 15:29:43 -08:00
mach-mmp
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-moxart
…
mach-mv78xx0
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-mvebu
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-mxs
ARM: mxs: constify platform_suspend_ops
2017-09-20 22:21:08 +08:00
mach-netx
…
mach-nomadik
…
mach-nspire
…
mach-omap1
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-omap2
ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
2017-12-07 15:52:21 +01:00
mach-orion5x
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
mach-oxnas
…
mach-picoxcell
…
mach-prima2
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-pxa
This pull request contains the following core changes:
2017-11-22 20:46:06 -10:00
mach-qcom
…
mach-realview
…
mach-rockchip
…
mach-rpc
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-s3c24xx
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-s3c64xx
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-s5pv210
…
mach-sa1100
Merge branch 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2017-11-14 17:52:21 -08:00
mach-shmobile
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-socfpga
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-spear
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-sti
…
mach-stm32
…
mach-sunxi
ARM: sunxi: add support for R40 SoC
2017-09-22 21:57:09 +02:00
mach-tango
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-tegra
Merge branch 'linus' into locking/core, to resolve conflicts
2017-11-07 10:32:44 +01:00
mach-u300
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-uniphier
kbuild: remove all dummy assignments to obj-
2017-11-18 11:46:06 +09:00
mach-ux500
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-versatile
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-vexpress
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
mach-vt8500
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-w90x900
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-zx
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mach-zynq
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mm
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
2017-11-26 15:03:49 -08:00
net
bpf: fix net.core.bpf_jit_enable race
2017-12-17 20:34:36 +01:00
nwfpe
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
oprofile
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
plat-iop
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
plat-omap
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
plat-orion
…
plat-pxa
…
plat-samsung
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
plat-versatile
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
probes
arm/kprobes: Remove jprobe test case
2017-11-07 11:25:14 +01:00
tools
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
vdso
Merge branch 'linus' into locking/core, to resolve conflicts
2017-11-07 10:32:44 +01:00
vfp
…
xen
xen: re-introduce support for grant v2 interface
2017-11-06 15:50:17 -05:00
Kconfig
ARM: SoC platform updates for 4.15
2017-11-16 14:05:12 -08:00
Kconfig-nommu
Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
2017-11-16 12:50:35 -08:00
Kconfig.debug
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
2017-11-26 15:03:49 -08:00
Makefile
Kbuild updates for v4.15
2017-11-17 17:45:29 -08:00