Re: linux-next: manual merge of the trivial tree with the regulator tree

2015-08-09 Thread Krzysztof Kozłowski
2015-08-10 11:37 GMT+09:00 Stephen Rothwell : > Hi Jiri, > > Today's linux-next merge of the trivial tree got a conflict in: > > drivers/regulator/max77843.c > > between commit: > > 2a32b401a11f ("regulator: Remove the max77843 driver") > > from the regulator tree and commit: > > 971bd8fa369a

Re: linux-next: manual merge of the trivial tree with the pm tree

2014-12-02 Thread Stephen Rothwell
Hi, On Wed, 3 Dec 2014 15:01:53 +1100 Stephen Rothwell wrote: > > I fixed it up (the pm tree change was a subset of the trivial tree one) ^^ superset -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp0HS_Ewg8R5.pgp Descripti

Re: linux-next: manual merge of the trivial tree

2013-10-16 Thread Jozsef Kadlecsik
On Wed, 16 Oct 2013, Pablo Neira Ayuso wrote: > On Wed, Oct 16, 2013 at 11:20:04AM +0200, Jiri Kosina wrote: > > On Wed, 16 Oct 2013, Jozsef Kadlecsik wrote: > > > > > > Today's linux-next merge of the trivial tree got conflicts in > > > > > > > > net/netfilter/xt_set.c > > > > > > > >

Re: linux-next: manual merge of the trivial tree

2013-10-16 Thread Pablo Neira Ayuso
On Wed, Oct 16, 2013 at 11:20:04AM +0200, Jiri Kosina wrote: > On Wed, 16 Oct 2013, Jozsef Kadlecsik wrote: > > > > Today's linux-next merge of the trivial tree got conflicts in > > > > > > net/netfilter/xt_set.c > > > > > > caused by commits 3f79410 (treewide: Fix common typo in "identify") a

Re: linux-next: manual merge of the trivial tree

2013-10-16 Thread Jiri Kosina
On Wed, 16 Oct 2013, Jozsef Kadlecsik wrote: > > Today's linux-next merge of the trivial tree got conflicts in > > > > net/netfilter/xt_set.c > > > > caused by commits 3f79410 (treewide: Fix common typo in "identify") and > > bd3129f (netfilter: ipset: order matches and targets separatedly i

Re: linux-next: manual merge of the trivial tree

2013-10-16 Thread Jozsef Kadlecsik
On Tue, 15 Oct 2013, Thierry Reding wrote: > Today's linux-next merge of the trivial tree got conflicts in > > net/netfilter/xt_set.c > > caused by commits 3f79410 (treewide: Fix common typo in "identify") and > bd3129f (netfilter: ipset: order matches and targets separatedly in > xt_set.c

Re: linux-next: manual merge of the trivial tree with the mips tree

2013-01-22 Thread Stephen Rothwell
Hi Jiri, On Wed, 23 Jan 2013 14:03:48 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the trivial tree got a conflict in > arch/mips/cavium-octeon/executive/cvmx-helper-util.c between commit > baf783ede9dc ("MIPS: Whitespace cleanup") from the mips tree and commit > d82603c6da75 ("

Re: linux-next: manual merge of the trivial tree with the mfd tree

2012-10-02 Thread Samuel Ortiz
Hi Jiri, On Tue, Oct 02, 2012 at 12:21:16AM +0200, Jiri Kosina wrote: > On Wed, 12 Sep 2012, Stephen Rothwell wrote: > > > Hi Jiri, > > > > Today's linux-next merge of the trivial tree got a conflict in > > drivers/video/backlight/88pm860x_bl.c between commit a6ccdcd98c39 ("mfd: > > 88pm860x: Us

Re: linux-next: manual merge of the trivial tree with the mfd tree

2012-10-01 Thread Jiri Kosina
On Wed, 12 Sep 2012, Stephen Rothwell wrote: > Hi Jiri, > > Today's linux-next merge of the trivial tree got a conflict in > drivers/video/backlight/88pm860x_bl.c between commit a6ccdcd98c39 ("mfd: > 88pm860x: Use REG resource for backlight") from the mfd tree and commit > e1c9ac420ef1 ("Revert "