Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A function in kernel/bpf/syscall.c which got a bug fix in 'net'
was moved to kernel/bpf/verifier.c in 'net-next'.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/boot/dts/am335x-baltos.dtsi 2 additions, 0 deletionsarch/arm/boot/dts/am335x-baltos.dtsi
- arch/arm/boot/dts/am335x-evmsk.dts 1 addition, 0 deletionsarch/arm/boot/dts/am335x-evmsk.dts
- arch/arm/boot/dts/dra7.dtsi 2 additions, 0 deletionsarch/arm/boot/dts/dra7.dtsi
- arch/arm/boot/dts/logicpd-torpedo-som.dtsi 1 addition, 1 deletionarch/arm/boot/dts/logicpd-torpedo-som.dtsi
- arch/arm/boot/dts/sun8i-a33.dtsi 6 additions, 6 deletionsarch/arm/boot/dts/sun8i-a33.dtsi
- arch/arm/mach-omap2/common.h 1 addition, 0 deletionsarch/arm/mach-omap2/common.h
- arch/arm/mach-omap2/omap-hotplug.c 1 addition, 1 deletionarch/arm/mach-omap2/omap-hotplug.c
- arch/arm/mach-omap2/omap-mpuss-lowpower.c 18 additions, 4 deletionsarch/arm/mach-omap2/omap-mpuss-lowpower.c
- arch/arm/mach-omap2/omap-smc.S 0 additions, 1 deletionarch/arm/mach-omap2/omap-smc.S
- arch/arm/mach-omap2/omap-smp.c 76 additions, 14 deletionsarch/arm/mach-omap2/omap-smp.c
- arch/arm/mach-omap2/omap_device.c 8 additions, 0 deletionsarch/arm/mach-omap2/omap_device.c
- arch/arm/mach-orion5x/Kconfig 1 addition, 0 deletionsarch/arm/mach-orion5x/Kconfig
- arch/arm/plat-orion/common.c 5 additions, 0 deletionsarch/arm/plat-orion/common.c
- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi 2 additions, 0 deletionsarch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
- arch/parisc/include/asm/uaccess.h 55 additions, 31 deletionsarch/parisc/include/asm/uaccess.h
- arch/parisc/lib/lusercopy.S 14 additions, 13 deletionsarch/parisc/lib/lusercopy.S
- arch/sparc/Kconfig 1 addition, 1 deletionarch/sparc/Kconfig
- arch/sparc/mm/hugetlbpage.c 16 additions, 0 deletionsarch/sparc/mm/hugetlbpage.c
- arch/x86/include/asm/pmem.h 31 additions, 11 deletionsarch/x86/include/asm/pmem.h
Please register or sign in to comment