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

Browse source

There were quite a few overlapping sets of changes here.

Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.

Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly.  If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.

In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().

Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.

The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.

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

...

This commit is contained in:

David S. Miller 2017-10-22 13:36:53 +01:00

parent bdd091bab8 b5ac3beb5a

commit f8ddadc4db

415 changed files with 4545 additions and 2001 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

10

Documentation/ABI/testing/sysfs-kernel-mm-swap

View file

14

Documentation/core-api/kernel-api.rst

View file

1

Documentation/process/index.rst

View file

147

Documentation/process/kernel-enforcement-statement.rst

View file

6

MAINTAINERS

View file

8

Makefile

View file

2

arch/arm/Makefile

View file

4

arch/arm/boot/compressed/debug.S

View file

4

arch/arm/boot/dts/armada-38x.dtsi

View file

4

arch/arm/boot/dts/at91-sama5d27_som1.dtsi

View file

16

arch/arm/boot/dts/at91-sama5d2_xplained.dts

View file

9

arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

View file

5

arch/arm/boot/dts/bcm2837-rpi-3-b.dts

View file

7

arch/arm/boot/dts/bcm283x.dtsi

View file

3

arch/arm/boot/dts/gemini.dtsi

View file

8

arch/arm/boot/dts/imx7d.dtsi

View file

3

arch/arm/boot/dts/moxart.dtsi

View file

1

arch/arm/boot/dts/sama5d2.dtsi

View file

16

arch/arm/boot/dts/sun6i-a31.dtsi

View file

8

arch/arm/kernel/debug.S

View file

4

arch/arm/mach-ux500/cpu-db8500.c

View file

4

arch/arm/mach-ux500/pm.c

View file

5

arch/arm/mm/nommu.c

View file

9

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts

View file

6

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

View file

6

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

View file

10

arch/arm64/boot/dts/renesas/salvator-common.dtsi

View file

2

arch/arm64/boot/dts/rockchip/rk3328.dtsi

View file

2

arch/arm64/boot/dts/rockchip/rk3368.dtsi

View file

4

arch/arm64/boot/dts/rockchip/rk3399-firefly.dts

View file

4

arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi

View file

4

arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi

View file

6

arch/mips/include/asm/cmpxchg.h

View file

38

arch/mips/loongson32/common/platform.c

View file

2

arch/mips/math-emu/cp1emu.c

View file

2

arch/mips/net/ebpf_jit.c

View file

6

arch/mips/tools/generic-board-config.sh

View file

2

arch/parisc/kernel/parisc_ksyms.c

View file

6

arch/parisc/kernel/syscall.S

View file

5

arch/parisc/kernel/time.c

View file

45

arch/powerpc/kernel/trace/ftrace_64_mprofile.S

View file

6

arch/powerpc/lib/sstep.c

View file

1

arch/powerpc/mm/numa.c

View file

39

arch/powerpc/perf/imc-pmu.c

View file

2

arch/s390/configs/zfcpdump_defconfig

View file

3

arch/s390/kernel/smp.c

View file

4

arch/x86/entry/entry_32.S

View file

12

arch/x86/events/intel/uncore.c

View file

5

arch/x86/hyperv/hv_init.c

View file

57

arch/x86/hyperv/mmu.c

View file

4

arch/x86/include/asm/alternative-asm.h

View file

6

arch/x86/include/asm/alternative.h

View file

1

arch/x86/include/asm/mce.h

View file

8

arch/x86/include/asm/mmu_context.h

View file

1

arch/x86/include/asm/mshyperv.h

View file

24

arch/x86/include/asm/tlbflush.h

View file

15

arch/x86/kernel/apic/apic.c

View file

7

arch/x86/kernel/cpu/mcheck/mce-internal.h

View file

2

arch/x86/kernel/cpu/mcheck/mce_amd.c

View file

27

arch/x86/kernel/cpu/microcode/core.c

View file

13

arch/x86/kernel/kprobes/common.h

View file

2

arch/x86/kernel/kprobes/core.c

View file

4

arch/x86/kernel/reboot.c

View file

38

arch/x86/kernel/unwind_frame.c

View file

15

arch/x86/kvm/mmu.c

View file

3

arch/x86/kvm/paging_tmpl.h

View file

2

arch/x86/kvm/vmx.c

View file

11

arch/x86/mm/Makefile

View file

153

arch/x86/mm/tlb.c

View file

4

arch/x86/xen/enlighten.c

View file

26

block/bio.c

View file

4

crypto/asymmetric_keys/asymmetric_type.c

View file

3

crypto/asymmetric_keys/pkcs7_parser.c

View file

10

crypto/shash.c

View file

17

crypto/skcipher.c

View file

6

crypto/xts.c

View file

29

drivers/acpi/property.c

View file

95

drivers/android/binder.c

View file

12

drivers/base/node.c

View file

19

drivers/base/property.c

View file

2

drivers/block/nbd.c

View file

2

drivers/block/skd_main.c

View file

2

drivers/bus/mvebu-mbus.c

View file

4

drivers/crypto/axis/artpec6_crypto.c

View file

15

drivers/crypto/stm32/stm32-hash.c

View file

17

drivers/dma-buf/sync_file.c

View file

41

drivers/dma/altera-msgdma.c

View file

19

drivers/dma/edma.c

View file

3

drivers/dma/ti-dma-crossbar.c

View file

3

drivers/gpio/Kconfig

View file

24

drivers/gpio/gpio-omap.c

View file

2

drivers/gpio/gpiolib-acpi.c

View file

2

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

View file

23

drivers/gpu/drm/amd/scheduler/gpu_scheduler.c

View file

1

drivers/gpu/drm/drm_atomic_helper.c

View file

8

drivers/gpu/drm/exynos/exynos_drm_drv.c

View file

22

drivers/gpu/drm/i915/gvt/sched_policy.c

View file

10

drivers/gpu/drm/i915/i915_gem.c

View file

63

drivers/gpu/drm/i915/i915_gem_evict.c

View file

1

drivers/gpu/drm/i915/i915_reg.h

View file

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