Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
Conflicts:
include/linux/kcore.h
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Showing
- Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt 1 addition, 0 deletions...devicetree/bindings/interrupt-controller/renesas,irqc.txt
- MAINTAINERS 10 additions, 0 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arc/Kconfig 15 additions, 6 deletionsarch/arc/Kconfig
- arch/arc/Makefile 6 additions, 0 deletionsarch/arc/Makefile
- arch/arc/boot/dts/abilis_tb100.dtsi 29 additions, 29 deletionsarch/arc/boot/dts/abilis_tb100.dtsi
- arch/arc/boot/dts/abilis_tb100_dvk.dts 7 additions, 7 deletionsarch/arc/boot/dts/abilis_tb100_dvk.dts
- arch/arc/boot/dts/abilis_tb101.dtsi 29 additions, 29 deletionsarch/arc/boot/dts/abilis_tb101.dtsi
- arch/arc/boot/dts/abilis_tb101_dvk.dts 7 additions, 7 deletionsarch/arc/boot/dts/abilis_tb101_dvk.dts
- arch/arc/boot/dts/abilis_tb10x.dtsi 30 additions, 30 deletionsarch/arc/boot/dts/abilis_tb10x.dtsi
- arch/arc/boot/dts/axc001.dtsi 3 additions, 3 deletionsarch/arc/boot/dts/axc001.dtsi
- arch/arc/boot/dts/axc003.dtsi 8 additions, 8 deletionsarch/arc/boot/dts/axc003.dtsi
- arch/arc/boot/dts/axc003_idu.dtsi 8 additions, 8 deletionsarch/arc/boot/dts/axc003_idu.dtsi
- arch/arc/boot/dts/axs10x_mb.dtsi 11 additions, 11 deletionsarch/arc/boot/dts/axs10x_mb.dtsi
- arch/arc/boot/dts/hsdk.dts 31 additions, 2 deletionsarch/arc/boot/dts/hsdk.dts
- arch/arc/boot/dts/vdk_axc003.dtsi 2 additions, 2 deletionsarch/arc/boot/dts/vdk_axc003.dtsi
- arch/arc/boot/dts/vdk_axc003_idu.dtsi 2 additions, 2 deletionsarch/arc/boot/dts/vdk_axc003_idu.dtsi
- arch/arc/boot/dts/vdk_axs10x_mb.dtsi 9 additions, 9 deletionsarch/arc/boot/dts/vdk_axs10x_mb.dtsi
- arch/arc/configs/hsdk_defconfig 1 addition, 0 deletionsarch/arc/configs/hsdk_defconfig
- arch/arc/include/asm/arcregs.h 2 additions, 10 deletionsarch/arc/include/asm/arcregs.h
Loading
Please register or sign in to comment