Two trivial overlapping changes conflicts in MPLS and mlx5.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/devicetree/bindings/net/mediatek-net.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/net/mediatek-net.txt
- Documentation/devicetree/bindings/net/phy.txt 3 additions, 2 deletionsDocumentation/devicetree/bindings/net/phy.txt
- Documentation/devicetree/bindings/spi/sh-msiof.txt 13 additions, 6 deletionsDocumentation/devicetree/bindings/spi/sh-msiof.txt
- Documentation/filesystems/proc.txt 3 additions, 2 deletionsDocumentation/filesystems/proc.txt
- Documentation/power/states.txt 1 addition, 3 deletionsDocumentation/power/states.txt
- MAINTAINERS 27 additions, 7 deletionsMAINTAINERS
- Makefile 2 additions, 2 deletionsMakefile
- arch/arc/Kconfig 1 addition, 1 deletionarch/arc/Kconfig
- arch/arc/include/asm/cache.h 5 additions, 4 deletionsarch/arc/include/asm/cache.h
- arch/arc/include/asm/entry-arcv2.h 2 additions, 0 deletionsarch/arc/include/asm/entry-arcv2.h
- arch/arc/include/asm/module.h 2 additions, 2 deletionsarch/arc/include/asm/module.h
- arch/arc/include/asm/ptrace.h 1 addition, 1 deletionarch/arc/include/asm/ptrace.h
- arch/arc/include/asm/setup.h 1 addition, 0 deletionsarch/arc/include/asm/setup.h
- arch/arc/kernel/intc-arcv2.c 3 additions, 3 deletionsarch/arc/kernel/intc-arcv2.c
- arch/arc/kernel/intc-compact.c 2 additions, 2 deletionsarch/arc/kernel/intc-compact.c
- arch/arc/kernel/mcip.c 4 additions, 0 deletionsarch/arc/kernel/mcip.c
- arch/arc/kernel/module.c 3 additions, 1 deletionarch/arc/kernel/module.c
- arch/arc/mm/cache.c 122 additions, 33 deletionsarch/arc/mm/cache.c
- arch/arc/mm/init.c 5 additions, 0 deletionsarch/arc/mm/init.c
- arch/arm/boot/dts/Makefile 1 addition, 0 deletionsarch/arm/boot/dts/Makefile
Loading
Please register or sign in to comment