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

2018-10-29 Thread Tony Lindgren
* Stephen Rothwell [181028 23:14]: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in: > > include/linux/platform_data/gpio-omap.h > > between commit: > > b764a5863fd8 ("gpio: omap: Remove custom PM calls and use cpu_pm instead") > > from Linus' tree and commit:

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

2016-09-25 Thread Robert Jarzmik
Russell King - ARM Linux writes: > On Mon, Sep 05, 2016 at 10:58:03AM +1000, Stephen Rothwell wrote: >> I fixed it up (I deleted the file) and can carry the fix as >> necessary. This is now fixed as far as linux-next is concerned, but any >> non trivial conflicts should be mentioned to your upstr

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

2016-09-06 Thread Russell King - ARM Linux
On Tue, Sep 06, 2016 at 12:17:48PM +0200, Arnd Bergmann wrote: > On Monday, September 5, 2016 7:26:03 PM CEST Russell King - ARM Linux wrote: > > On Mon, Sep 05, 2016 at 10:58:03AM +1000, Stephen Rothwell wrote: > > > I fixed it up (I deleted the file) and can carry the fix as > > > necessary. This

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

2016-09-06 Thread Arnd Bergmann
On Monday, September 5, 2016 7:26:03 PM CEST Russell King - ARM Linux wrote: > On Mon, Sep 05, 2016 at 10:58:03AM +1000, Stephen Rothwell wrote: > > I fixed it up (I deleted the file) and can carry the fix as > > necessary. This is now fixed as far as linux-next is concerned, but any > > non trivia

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

2016-09-06 Thread Russell King - ARM Linux
On Mon, Sep 05, 2016 at 10:58:03AM +1000, Stephen Rothwell wrote: > I fixed it up (I deleted the file) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submi

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

2015-06-01 Thread Michal Simek
Hi, On 06/01/2015 02:25 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/zynq-7000.dtsi between commit 9eeb5161397a ("ARM: > zynq: DT: Use the zynq binding with macb") from Linus' tree and commit > 4481b18b7cf0 ("ARM: zyn

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

2014-01-30 Thread Mike Turquette
On Wed, Jan 29, 2014 at 9:33 PM, Kevin Hilman wrote: > On Wed, Jan 29, 2014 at 4:19 PM, Stephen Rothwell > wrote: >> Hi all, >> >> Today's linux-next merge of the arm-soc tree got a conflict in >> drivers/clk/Makefile between commit fd3fdaf09f26 ("clk: sort Makefile") >> from Linus' tree and com

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

2014-01-29 Thread Kevin Hilman
On Wed, Jan 29, 2014 at 4:19 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/clk/Makefile between commit fd3fdaf09f26 ("clk: sort Makefile") > from Linus' tree and commit 7ee2c5117483 ("clk: bcm281xx: add initial > clock framework

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

2013-08-27 Thread Stephen Rothwell
Hi Stephen, On Tue, 27 Aug 2013 10:17:21 -0600 Stephen Warren wrote: > > On 08/27/2013 02:29 AM, Stephen Rothwell wrote: > > > > Today's linux-next merge of the arm-soc tree got a conflict in > > arch/arm/boot/dts/tegra20-trimslice.dts between commit > > 30ca2226bea6 ("ARM: tegra: always enable

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

2013-08-27 Thread Stephen Warren
On 08/27/2013 02:29 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/tegra20-trimslice.dts between commit > 30ca2226bea6 ("ARM: tegra: always enable USB VBUS regulators") from > Linus' tree and commit 23f95ef2d951 ("ARM: