Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of easy overlapping changes in the confict
resolutions here.
Signed-off-by: 
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-devices-system-cpu 1 addition, 0 deletionsDocumentation/ABI/testing/sysfs-devices-system-cpu
- Documentation/admin-guide/kernel-parameters.txt 45 additions, 0 deletionsDocumentation/admin-guide/kernel-parameters.txt
- Documentation/networking/ppp_generic.txt 0 additions, 6 deletionsDocumentation/networking/ppp_generic.txt
- Documentation/userspace-api/index.rst 1 addition, 0 deletionsDocumentation/userspace-api/index.rst
- Documentation/userspace-api/spec_ctrl.rst 94 additions, 0 deletionsDocumentation/userspace-api/spec_ctrl.rst
- MAINTAINERS 21 additions, 9 deletionsMAINTAINERS
- arch/alpha/Kconfig 1 addition, 0 deletionsarch/alpha/Kconfig
- arch/alpha/include/asm/dma-mapping.h 6 additions, 2 deletionsarch/alpha/include/asm/dma-mapping.h
- arch/alpha/kernel/io.c 7 additions, 7 deletionsarch/alpha/kernel/io.c
- arch/alpha/kernel/pci-noop.c 0 additions, 33 deletionsarch/alpha/kernel/pci-noop.c
- arch/alpha/kernel/pci_iommu.c 1 addition, 3 deletionsarch/alpha/kernel/pci_iommu.c
- arch/arm/mm/dma-mapping.c 1 addition, 15 deletionsarch/arm/mm/dma-mapping.c
- arch/arm64/include/asm/atomic_lse.h 12 additions, 12 deletionsarch/arm64/include/asm/atomic_lse.h
- arch/arm64/kernel/arm64ksyms.c 8 additions, 0 deletionsarch/arm64/kernel/arm64ksyms.c
- arch/arm64/lib/tishift.S 2 additions, 13 deletionsarch/arm64/lib/tishift.S
- arch/arm64/mm/fault.c 51 additions, 0 deletionsarch/arm64/mm/fault.c
- arch/arm64/mm/mmu.c 10 additions, 6 deletionsarch/arm64/mm/mmu.c
- arch/powerpc/include/asm/exception-64s.h 29 additions, 0 deletionsarch/powerpc/include/asm/exception-64s.h
- arch/powerpc/include/asm/feature-fixups.h 19 additions, 0 deletionsarch/powerpc/include/asm/feature-fixups.h
- arch/powerpc/include/asm/security_features.h 11 additions, 0 deletionsarch/powerpc/include/asm/security_features.h
Loading
Please register or sign in to comment