Three trivial overlapping conflicts.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/driver-api/usb/power-management.rst 9 additions, 5 deletionsDocumentation/driver-api/usb/power-management.rst
- Documentation/networking/ip-sysctl.txt 2 additions, 0 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/networking/netdev-FAQ.rst 1 addition, 1 deletionDocumentation/networking/netdev-FAQ.rst
- Documentation/sysctl/vm.txt 8 additions, 8 deletionsDocumentation/sysctl/vm.txt
- Makefile 2 additions, 2 deletionsMakefile
- arch/arc/boot/dts/hsdk.dts 7 additions, 6 deletionsarch/arc/boot/dts/hsdk.dts
- arch/arc/lib/memset-archs.S 2 additions, 2 deletionsarch/arc/lib/memset-archs.S
- arch/arc/mm/cache.c 16 additions, 15 deletionsarch/arc/mm/cache.c
- arch/arm/Kconfig 1 addition, 1 deletionarch/arm/Kconfig
- arch/arm/Kconfig.debug 3 additions, 3 deletionsarch/arm/Kconfig.debug
- arch/arm/boot/compressed/head.S 15 additions, 1 deletionarch/arm/boot/compressed/head.S
- arch/arm/kernel/head-nommu.S 1 addition, 1 deletionarch/arm/kernel/head-nommu.S
- arch/arm64/kernel/ftrace.c 7 additions, 2 deletionsarch/arm64/kernel/ftrace.c
- arch/arm64/mm/init.c 1 addition, 1 deletionarch/arm64/mm/init.c
- arch/mips/net/ebpf_jit.c 3 additions, 2 deletionsarch/mips/net/ebpf_jit.c
- arch/powerpc/configs/skiroot_defconfig 1 addition, 0 deletionsarch/powerpc/configs/skiroot_defconfig
- arch/powerpc/mm/mmu_context_iommu.c 58 additions, 39 deletionsarch/powerpc/mm/mmu_context_iommu.c
- arch/powerpc/platforms/Kconfig.cputype 1 addition, 1 deletionarch/powerpc/platforms/Kconfig.cputype
- arch/x86/boot/compressed/misc.c 1 addition, 1 deletionarch/x86/boot/compressed/misc.c
- arch/x86/entry/vdso/vclock_gettime.c 2 additions, 2 deletionsarch/x86/entry/vdso/vclock_gettime.c
Loading
Please register or sign in to comment