linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: MAINTAINERS between commits: 81aa283c6924 ("MAINTAINERS: Add Actions Semi S900 clk entries") 677309b0e9e6 ("MAINTAINERS: Add entry for Actions Semi Owl SoCs DMA driver") from the arm-soc tree and commit: 9d8d47ea6ec6

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: MAINTAINERS between commits: 81aa283c6924 ("MAINTAINERS: Add Actions Semi S900 clk entries") 677309b0e9e6 ("MAINTAINERS: Add entry for Actions Semi Owl SoCs DMA driver") from the arm-soc tree and commit: 9d8d47ea6ec6

Re: linux-next: manual merge of the tip tree with the arm-soc tree

Hi All, On Mon, 19 Mar 2018 14:06:57 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/bus/arm-cci.c > > between commit: > > 3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver") > > from the arm-soc tree and

Re: linux-next: manual merge of the tip tree with the arm-soc tree

Hi All, On Mon, 19 Mar 2018 14:06:57 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/bus/arm-cci.c > > between commit: > > 3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver") > > from the arm-soc tree and commit: > >

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/bus/arm-cci.c between commit: 3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver") from the arm-soc tree and commit: edb39592a587 ("perf: Fix sibling iteration") from the tip tree. I fixed it up (I added the

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/bus/arm-cci.c between commit: 3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver") from the arm-soc tree and commit: edb39592a587 ("perf: Fix sibling iteration") from the tip tree. I fixed it up (I added the

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/bus/arm-cci.c between commit: 3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver") from the arm-soc tree and commit: 8343aae66167 ("perf/core: Remove perf_event::group_entry") from the tip tree. I fixed it up

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/bus/arm-cci.c between commit: 3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver") from the arm-soc tree and commit: 8343aae66167 ("perf/core: Remove perf_event::group_entry") from the tip tree. I fixed it up

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/mach-shmobile/intc-sh73a0.c between commit: 30f8925a57d8 ("ARM: shmobile: Remove legacy board code for KZM-A9-GT") from the arm-soc tree and commit: 0d3f2c92e004 ("irqchip/gic: Remove redundant

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/mach-shmobile/intc-sh73a0.c between commit: 30f8925a57d8 (ARM: shmobile: Remove legacy board code for KZM-A9-GT) from the arm-soc tree and commit: 0d3f2c92e004 (irqchip/gic: Remove redundant

Re: linux-next: manual merge of the tip tree with the arm-soc tree

* Stephen Rothwell [140925 23:26]: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > arch/arm/mach-omap2/irq.c between commit 8598066cddd1 ("arm: omap: irq: > move irq.c to drivers/irqchip/") from the arm-soc tree and commit > f978999f6096 ("Use the new handle_domain_irq

Re: linux-next: manual merge of the tip tree with the arm-soc tree

* Stephen Rothwell s...@canb.auug.org.au [140925 23:26]: Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-omap2/irq.c between commit 8598066cddd1 (arm: omap: irq: move irq.c to drivers/irqchip/) from the arm-soc tree and commit f978999f6096 (Use the new

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-omap2/irq.c between commit 8598066cddd1 ("arm: omap: irq: move irq.c to drivers/irqchip/") from the arm-soc tree and commit f978999f6096 ("Use the new handle_domain_irq method to handle interrupts") from the tip

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-omap2/irq.c between commit 8598066cddd1 (arm: omap: irq: move irq.c to drivers/irqchip/) from the arm-soc tree and commit f978999f6096 (Use the new handle_domain_irq method to handle interrupts) from the tip tree. I

Re: linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, On Thu, 20 Mar 2014 14:36:03 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in > arch/arm/mach-imx/pm-imx6q.c between commit 9cdde7217e92 ("ARM: imx6: > rename pm-imx6q.c to pm-imx6.c") from the arm-soc tree and commit > 8435cf757632 ("arm:

Re: linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, On Thu, 20 Mar 2014 14:36:03 +1100 Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-imx/pm-imx6q.c between commit 9cdde7217e92 (ARM: imx6: rename pm-imx6q.c to pm-imx6.c) from the arm-soc tree and commit

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-zynq/common.c between commit 016f4dcae81e ("ARM: zynq: Split slcr in two parts") from the arm-soc tree and commit cd325295871f ("arm: zynq: Add support for cpufreq") from the tip tree. I fixed it up (see below) and

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-zynq/Kconfig between commits ddb902cc3459 ("ARM: centralize common multi-platform kconfig options") and 016f4dcae81e ("ARM: zynq: Split slcr in two parts") from the arm-soc tree and commits 61f1fc7e9258 ("arm: zynq:

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/boot/dts/sun7i-a20.dtsi between commit 36ab3e73b7ac ("ARM: dt: sun7i: Add A20 SPI controller nodes") from the arm-soc tree and commit 8ff973a26763 ("ARM: sun7i/sun6i: dts: Add NMI irqchip support") from the tip tree. I

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/boot/dts/sun7i-a20.dtsi between commit 36ab3e73b7ac (ARM: dt: sun7i: Add A20 SPI controller nodes) from the arm-soc tree and commit 8ff973a26763 (ARM: sun7i/sun6i: dts: Add NMI irqchip support) from the tip tree. I fixed

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-zynq/Kconfig between commits ddb902cc3459 (ARM: centralize common multi-platform kconfig options) and 016f4dcae81e (ARM: zynq: Split slcr in two parts) from the arm-soc tree and commits 61f1fc7e9258 (arm: zynq: Don't

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-zynq/common.c between commit 016f4dcae81e (ARM: zynq: Split slcr in two parts) from the arm-soc tree and commit cd325295871f (arm: zynq: Add support for cpufreq) from the tip tree. I fixed it up (see below) and can

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-imx/pm-imx6q.c between commit 9cdde7217e92 ("ARM: imx6: rename pm-imx6q.c to pm-imx6.c") from the arm-soc tree and commit 8435cf757632 ("arm: Replace various irq_desc accesses") from the tip tree. I fixed it up (by

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-imx/pm-imx6q.c between commit 9cdde7217e92 (ARM: imx6: rename pm-imx6q.c to pm-imx6.c) from the arm-soc tree and commit 8435cf757632 (arm: Replace various irq_desc accesses) from the tip tree. I fixed it up (by

Re: linux-next: manual merge of the tip tree with the arm-soc tree

On Mon, 2014-03-17 at 04:35PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > arch/arm/mach-zynq/Kconfig between commit ddb902cc3459 ("ARM: centralize > common multi-platform kconfig options") from the arm-soc tree and commit >

Re: linux-next: manual merge of the tip tree with the arm-soc tree

On Mon, 2014-03-17 at 04:35PM +1100, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-zynq/Kconfig between commit ddb902cc3459 (ARM: centralize common multi-platform kconfig options) from the arm-soc tree and commit cd325295871f (arm:

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in drivers/clocksource/Kconfig between commit 3f8e8cee2f4b ("clocksource: qcom: Move clocksource code out of mach-msm") from the arm-soc tree and commit fd3f1270d237 ("clocksource: Add Kconfig entries for CMT, MTU2, TMU and STI")

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-zynq/Kconfig between commit ddb902cc3459 ("ARM: centralize common multi-platform kconfig options") from the arm-soc tree and commit cd325295871f ("arm: zynq: Add support for cpufreq") from the tip tree. I fixed it

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm/mach-zynq/Kconfig between commit ddb902cc3459 (ARM: centralize common multi-platform kconfig options) from the arm-soc tree and commit cd325295871f (arm: zynq: Add support for cpufreq) from the tip tree. I fixed it up

linux-next: manual merge of the tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the tip tree got a conflict in drivers/clocksource/Kconfig between commit 3f8e8cee2f4b (clocksource: qcom: Move clocksource code out of mach-msm) from the arm-soc tree and commit fd3f1270d237 (clocksource: Add Kconfig entries for CMT, MTU2, TMU and STI) from