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

Hi Daniel, Today's linux-next merge of the clockevents tree got a conflict in: arch/arm/boot/dts/rk3188.dtsi between commit: 2e1aa605fadd ("ARM: dts: rockchip: fix PPI misconfiguration on Cortex-A9 socs") from the arm-soc tree and commit: 500d0aa918a2 ("ARM: dts: rockchip: disable arm-

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

On Mon, Aug 1, 2016 at 9:26 PM, Linus Torvalds wrote: > > Thanks, applied. Gah, and I messed up the whitespace while doing so, so it looks a bit odd. Sadly, I only noticed after having already pushed out (since I had decided to just push out immediately as I don't build-test ARM anyway). Oh well

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

On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell wrote: > > This merge fix patch was missed when Linus merged the various bits of > the arm-soc tree overnight. :-( > > Here is the merge fix patch again: Thanks, applied. Linus

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

Hi all, On Wed, 27 Jul 2016 08:08:45 +1000 Stephen Rothwell wrote: > > On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the clockevents tree got a conflict in: > > > > arch/arm/Kconfig > > > > between commit: > > > > c86f51737f8d ("ARM: cl

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

Hi All, On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell wrote: > > Hi Daniel, > > Today's linux-next merge of the clockevents tree got a conflict in: > > arch/arm/Kconfig > > between commit: > > c86f51737f8d ("ARM: clps711x: Switch to MULTIPLATFORM") > > from the arm-soc tree and com

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

On 07/11/2016 07:28 AM, Stephen Rothwell wrote: > Hi all, > > On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the clockevents tree got a conflict in: >> >> arch/arm/Kconfig >> >> between commit: >> >> c86f51737f8d ("ARM: clps711x: Switch to MULTI

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

Hi all, On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the clockevents tree got a conflict in: > > arch/arm/Kconfig > > between commit: > > c86f51737f8d ("ARM: clps711x: Switch to MULTIPLATFORM") > > from the arm-soc tree and commit: > > 250e

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

Hi Daniel, Today's linux-next merge of the clockevents tree got a conflict in: arch/arm/Kconfig between commit: c86f51737f8d ("ARM: clps711x: Switch to MULTIPLATFORM") from the arm-soc tree and commit: 250e46aa3bb3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") from the

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

Hi Daniel, Today's linux-next merge of the clockevents tree got conflicts in: arch/arm/Kconfig arch/arm/mach-mxs/Kconfig between commit: 5c34a4e89c74 ("ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB") from the arm-soc tree and commits: db01e25865a3 ("clocksource/drivers/clps_7

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

Hi Daniel, On Mon, May 26, 2014 at 03:43:31PM +1000, Stephen Rothwell wrote: > Hi Daniel, > > Today's linux-next merge of the clockevents tree got a conflict in > arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts: > vf610-twr: Add support for sdhc1") from the arm-soc tree and co

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

> Subject: linux-next: manual merge of the clockevents tree with the arm-soc > tree > > Hi Daniel, > > Today's linux-next merge of the clockevents tree got a conflict in > arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts: > vf610-twr: Add su

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

Hi Daniel, Today's linux-next merge of the clockevents tree got a conflict in arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts: vf610-twr: Add support for sdhc1") from the arm-soc tree and commit 07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer node") from th