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:

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: Use REG

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

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

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

2012-09-11 Thread Stephen Rothwell
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 "backlight: fix memory leak on obscure error path"") from

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

2012-09-11 Thread Stephen Rothwell
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 backlight: fix memory leak on obscure error path) from the