Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source

The BPF verifier conflict was some minor contextual issue.

The TUN conflict was less trivial.  Cong Wang fixed a memory leak of
tfile->tx_array in 'net'.  This is an skb_array.  But meanwhile in
net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
ptr_ring.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2018-01-19 22:59:33 -05:00

parent 85831e56a1 ec835f8104

commit 8565d26bcb

115 changed files with 1723 additions and 751 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/arm/boot/dts/da850-lcdk.dts

View file

10

arch/arm/boot/dts/kirkwood-openblocks_a7.dts

View file

2

arch/arm/boot/dts/sun4i-a10.dtsi

View file

2

arch/arm/boot/dts/sun7i-a20.dtsi

View file

2

arch/arm/configs/sunxi_defconfig

View file

225

arch/arm/net/bpf_jit_32.c

View file

1

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

View file

13

arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

View file

9

arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

View file

20

arch/arm64/net/bpf_jit_comp.c

View file

37

arch/ia64/include/asm/atomic.h

View file

1

arch/powerpc/Kconfig

View file

1

arch/powerpc/include/asm/hvcall.h

View file

11

arch/powerpc/kernel/setup-common.c

View file

38

arch/powerpc/kernel/setup_64.c

View file

26

arch/powerpc/xmon/xmon.c

View file

11

arch/x86/entry/entry_32.S

View file

11

arch/x86/entry/entry_64.S

View file

4

arch/x86/events/intel/rapl.c

View file

1

arch/x86/include/asm/apic.h

View file

3

arch/x86/include/asm/cpufeatures.h

View file

4

arch/x86/include/asm/mem_encrypt.h

View file

6

arch/x86/include/asm/nospec-branch.h

View file

49

arch/x86/kernel/apic/apic.c

View file

7

arch/x86/kernel/apic/vector.c

View file

36

arch/x86/kernel/cpu/bugs.c

View file

8

arch/x86/kernel/cpu/intel_rdt.c

View file

1

arch/x86/kernel/cpu/scattered.c

View file

4

arch/x86/kernel/head64.c

View file

12

arch/x86/kernel/idt.c

View file

3

arch/x86/kernel/irqinit.c

View file

10

arch/x86/kernel/setup.c

View file

9

arch/x86/kernel/tsc.c

View file

7

arch/x86/mm/fault.c

View file

24

arch/x86/mm/kasan_init_64.c

View file

358

arch/x86/mm/mem_encrypt.c

View file

80

arch/x86/mm/mem_encrypt_boot.S

View file

1

drivers/ata/libata-core.c

View file

2

drivers/bcma/Kconfig

View file

30

drivers/gpio/gpio-mmio.c

View file

303

drivers/gpu/drm/i915/intel_display.c

View file

2

drivers/gpu/drm/i915/intel_drv.h

View file

83

drivers/gpu/drm/i915/intel_sprite.c

View file

1

drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h

View file

4

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

View file

3

drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c

View file

1

drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild

View file

41

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mcp77.c

View file

10

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h

View file

45

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmmcp77.c

View file

16

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c

View file

9

drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c

View file

2

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

View file

4

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

View file

4

drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

View file

6

drivers/i2c/i2c-core-base.c

View file

13

drivers/i2c/i2c-core-smbus.c

View file

6

drivers/input/misc/twl4030-vibra.c

View file

3

drivers/input/misc/twl6040-vibra.c

View file

23

drivers/input/mouse/alps.c

View file

10

drivers/input/mouse/alps.h

View file

1

drivers/input/mouse/synaptics.c

View file

4

drivers/input/rmi4/rmi_driver.c

View file

16

drivers/input/touchscreen/88pm860x-ts.c

View file

4

drivers/input/touchscreen/of_touchscreen.c

View file

14

drivers/mmc/host/sdhci-esdhc-imx.c

View file

21

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

View file

16

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

View file

1

drivers/net/ethernet/freescale/fs_enet/fs_enet.h

View file

24

drivers/net/ethernet/ibm/ibmvnic.c

View file

9

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

View file

20

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

View file

2

drivers/net/ethernet/ti/netcp_core.c

View file

18

drivers/net/tun.c

View file

13

drivers/net/usb/r8152.c

View file

9

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c

View file

28

drivers/nvme/host/pci.c

View file

4

drivers/phy/phy-core.c

View file

2

drivers/ssb/Kconfig

View file

7

fs/proc/array.c

View file

2

include/linux/compiler-gcc.h

View file

8

include/linux/delayacct.h

View file

8

include/linux/vermagic.h

View file

4

kernel/bpf/core.c

View file

64

kernel/bpf/verifier.c

View file

1

kernel/cgroup/cgroup.c

View file

42

kernel/delayacct.c

View file

86

kernel/futex.c

View file

26

kernel/locking/rtmutex.c

View file

1

kernel/locking/rtmutex_common.h

View file

6

kernel/sched/core.c

View file

2

kernel/time/timer.c

View file

3

kernel/trace/ring_buffer.c

View file

16

kernel/trace/trace_events.c

View file

13

kernel/workqueue.c

View file

10

mm/memory.c

View file

1

mm/page_owner.c

View file

36

net/can/af_can.c

View file

Some files were not shown because too many files have changed in this diff Show more