linux-next: manual merge of the tip tree with the renesas tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/mach-shmobile/setup-r8a7779.c between commit: 3fecc170e5b7 ("ARM: shmobile: r8a7779: Remove legacy SoC code") from the renesas tree and commit: 0d3f2c92e004 ("irqchip/gic: Remove redundant

linux-next: manual merge of the tip tree with the renesas tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/mach-shmobile/setup-r8a7779.c between commit: 3fecc170e5b7 (ARM: shmobile: r8a7779: Remove legacy SoC code) from the renesas tree and commit: 0d3f2c92e004 (irqchip/gic: Remove redundant gic_set_irqchip_flags)

linux-next: manual merge of the tip tree with the renesas tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-shmobile/Kconfig between commit 4a51856b4267 ("ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791") from the renesas tree and commit aeb8fb7910fc ("ARM: shmobile: Remove CMT, TMU and STI Kconfig entries") from

linux-next: manual merge of the tip tree with the renesas tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-shmobile/Kconfig between commit 4a51856b4267 (ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791) from the renesas tree and commit aeb8fb7910fc (ARM: shmobile: Remove CMT, TMU and STI Kconfig entries) from the