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

2018-12-17 Thread Tony Lindgren
* Stephen Rothwell [181217 00:18]: > Hi all, > > Today's linux-next merge of the gpio tree got a conflict in: > > arch/arm/mach-omap1/board-ams-delta.c > > between commit: > > 19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED > device") > > from the arm-soc tree and

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

2016-10-05 Thread Linus Walleij
On Thu, Oct 6, 2016 at 12:41 AM, Stephen Rothwell wrote: > On Tue, 27 Sep 2016 15:05:42 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the gpio tree got a conflict in: >> >> arch/arm/mach-omap2/board-rx51-peripherals.c >> >> between commit: >> >> 9b7141d01a76 ("ARM: OMAP2+

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

2016-10-05 Thread Stephen Rothwell
Hi all, On Tue, 27 Sep 2016 15:05:42 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the gpio tree got a conflict in: > > arch/arm/mach-omap2/board-rx51-peripherals.c > > between commit: > > 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900") > > from the arm-soc

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

2016-09-27 Thread Tony Lindgren
* Stephen Rothwell [160926 22:06]: > Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in: > > arch/arm/mach-omap2/board-rx51-peripherals.c > > between commit: > > 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900") > > from the arm-soc tree and commit: > >

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

2014-07-29 Thread Thierry Reding
On Tue, Jul 29, 2014 at 10:19:49AM +0200, Stephen Rothwell wrote: > * PGP Signed by an unknown key > > Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in > arch/arm/mach-tegra/board-paz00.c between commit a0524acc94c9 ("ARM: > tegra: Sort includes alphabetically") from the