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

Browse source

Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmgenet.c
	net/core/sock.c

Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.

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

...

This commit is contained in:

David S. Miller 2017-03-15 11:59:10 -07:00

parent 9c79ddaa0f 95422dec6b

commit 101c431492

590 changed files with 7664 additions and 3397 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

9

Documentation/admin-guide/kernel-parameters.txt

View file

1

Documentation/arm64/silicon-errata.txt

View file

11

Documentation/cgroup-v2.txt

View file

2

Documentation/dev-tools/kcov.rst

View file

62

Documentation/devicetree/bindings/powerpc/4xx/emac.txt

View file

2

Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt

View file

53

Documentation/devicetree/bindings/usb/usb251xb.txt

View file

3

Documentation/networking/ip-sysctl.txt

View file

2

Documentation/trace/kprobetrace.txt

View file

2

Documentation/trace/uprobetracer.txt

View file

4

Documentation/virtual/kvm/api.txt

View file

4

Documentation/vm/userfaultfd.txt

View file

1

MAINTAINERS

View file

4

Makefile

View file

1

arch/arc/include/asm/hugepage.h

View file

1

arch/arc/include/asm/pgtable.h

View file

1

arch/arm/include/asm/kvm_arm.h

View file

1

arch/arm/include/asm/kvm_host.h

View file

1

arch/arm/include/asm/pgtable.h

View file

3

arch/arm/kvm/arm.c

View file

19

arch/arm/kvm/handle_exit.c

View file

2

arch/arm/xen/mm.c

View file

10

arch/arm64/Kconfig

View file

3

arch/arm64/include/asm/kvm_host.h

View file

4

arch/arm64/include/asm/pgtable-types.h

View file

19

arch/arm64/kvm/handle_exit.c

View file

64

arch/arm64/kvm/hyp/tlb.c

View file

1

arch/avr32/include/asm/pgtable-2level.h

View file

2

arch/avr32/oprofile/backtrace.c

View file

2

arch/cris/arch-v32/drivers/cryptocop.c

View file

1

arch/cris/include/asm/pgtable.h

View file

1

arch/frv/include/asm/pgtable.h

View file

1

arch/h8300/include/asm/pgtable.h

View file

2

arch/h8300/kernel/ptrace_h.c

View file

1

arch/hexagon/include/asm/pgtable.h

View file

2

arch/ia64/include/asm/pgtable.h

View file

1

arch/metag/include/asm/pgtable.h

View file

3

arch/microblaze/include/asm/page.h

View file

2

arch/mips/cavium-octeon/cpu.c

View file

1

arch/mips/cavium-octeon/crypto/octeon-crypto.c

View file

1

arch/mips/cavium-octeon/smp.c

View file

1

arch/mips/include/asm/fpu.h

View file

1

arch/mips/include/asm/pgtable-32.h

View file

1

arch/mips/include/asm/pgtable-64.h

View file

1

arch/mips/kernel/smp-bmips.c

View file

1

arch/mips/kernel/smp-mt.c

View file

1

arch/mips/loongson64/loongson-3/cop2-ex.c

View file

1

arch/mips/netlogic/common/smp.c

View file

3

arch/mips/netlogic/xlp/cop2-ex.c

View file

1

arch/mips/sgi-ip22/ip28-berr.c

View file

2

arch/mips/sgi-ip27/ip27-berr.c

View file

3

arch/mips/sgi-ip27/ip27-smp.c

View file

1

arch/mips/sgi-ip32/ip32-berr.c

View file

1

arch/mips/sgi-ip32/ip32-reset.c

View file

1

arch/mn10300/include/asm/page.h

View file

1

arch/nios2/include/asm/pgtable.h

View file

1

arch/openrisc/include/asm/pgtable.h

View file

166

arch/powerpc/Kconfig

View file

11

arch/powerpc/Makefile

View file

1

arch/powerpc/boot/zImage.lds.S

View file

2

arch/powerpc/crypto/crc32c-vpmsum_glue.c

View file

4

arch/powerpc/include/asm/bitops.h

View file

1

arch/powerpc/include/asm/book3s/32/pgtable.h

View file

88

arch/powerpc/include/asm/book3s/64/pgtable.h

View file

2

arch/powerpc/include/asm/checksum.h

View file

4

arch/powerpc/include/asm/cpuidle.h

View file

4

arch/powerpc/include/asm/elf.h

View file

108

arch/powerpc/include/asm/mce.h

View file

1

arch/powerpc/include/asm/nohash/32/pgtable.h

View file

3

arch/powerpc/include/asm/nohash/64/pgtable-4k.h

View file

1

arch/powerpc/include/asm/nohash/64/pgtable-64k.h

View file

2

arch/powerpc/include/asm/nohash/pgtable.h

View file

7

arch/powerpc/include/asm/ppc-opcode.h

View file

18

arch/powerpc/include/asm/prom.h

View file

3

arch/powerpc/kernel/cputable.c

View file

10

arch/powerpc/kernel/idle_book3s.S

View file

88

arch/powerpc/kernel/mce.c

View file

237

arch/powerpc/kernel/mce_power.c

View file

120

arch/powerpc/kernel/prom_init.c

View file

5

arch/powerpc/kernel/setup_64.c

View file

2

arch/powerpc/kvm/book3s_64_mmu_hv.c

View file

2

arch/powerpc/kvm/book3s_hv_rm_mmu.c

View file

1

arch/powerpc/lib/Makefile

View file

20

arch/powerpc/lib/sstep.c

View file

434

arch/powerpc/lib/test_emulate_step.c

View file

42

arch/powerpc/mm/init_64.c

View file

4

arch/powerpc/mm/pgtable-radix.c

View file

2

arch/powerpc/perf/core-book3s.c

View file

43

arch/powerpc/perf/isa207-common.c

View file

1

arch/powerpc/perf/isa207-common.h

View file

4

arch/powerpc/platforms/powernv/opal-wrappers.S

View file

21

arch/powerpc/platforms/powernv/opal.c

View file

20

arch/powerpc/platforms/powernv/pci-ioda.c

View file

12

arch/powerpc/purgatory/trampoline.S

View file

5

arch/powerpc/sysdev/axonram.c

View file

10

arch/powerpc/sysdev/xics/icp-opal.c

View file

17

arch/powerpc/sysdev/xics/xics-common.c

View file

2

arch/s390/configs/default_defconfig

View file

2

arch/s390/configs/gcov_defconfig

View file

2

arch/s390/configs/performance_defconfig

View file

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