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

On Mon, Jul 25, 2016 at 06:29:00AM -0700, Doug Anderson wrote: > Hi, > > On Mon, Jul 25, 2016 at 1:29 AM, Thierry Reding > wrote: > > On Mon, Jul 11, 2016 at 11:39:00PM +0200, Thierry Reding wrote: > >> On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote: >

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

On Mon, Jul 25, 2016 at 06:29:00AM -0700, Doug Anderson wrote: > Hi, > > On Mon, Jul 25, 2016 at 1:29 AM, Thierry Reding > wrote: > > On Mon, Jul 11, 2016 at 11:39:00PM +0200, Thierry Reding wrote: > >> On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote: > >> > On Mon, Jul 11, 2016

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

Hi, On Mon, Jul 25, 2016 at 1:29 AM, Thierry Reding wrote: > On Mon, Jul 11, 2016 at 11:39:00PM +0200, Thierry Reding wrote: >> On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote: >> > On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote: >> > > Hi,

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

Hi, On Mon, Jul 25, 2016 at 1:29 AM, Thierry Reding wrote: > On Mon, Jul 11, 2016 at 11:39:00PM +0200, Thierry Reding wrote: >> On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote: >> > On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote: >> > > Hi, >> > > >> > > On Sun, Jul

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

On Mon, Jul 11, 2016 at 11:39:00PM +0200, Thierry Reding wrote: > On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote: > > On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote: > > > Hi, > > > > > > On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell > > >

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

On Mon, Jul 11, 2016 at 11:39:00PM +0200, Thierry Reding wrote: > On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote: > > On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote: > > > Hi, > > > > > > On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell > > > wrote: > > > > Hi

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

On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote: > On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote: > > Hi, > > > > On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell > > wrote: > > > Hi Thierry, > > > > > > Today's linux-next merge of the pwm

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

On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote: > On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote: > > Hi, > > > > On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell > > wrote: > > > Hi Thierry, > > > > > > Today's linux-next merge of the pwm tree got a conflict

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

On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote: > Hi, > > On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell > wrote: > > Hi Thierry, > > > > Today's linux-next merge of the pwm tree got a conflict in: > > > > drivers/regulator/pwm-regulator.c > > > >

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

On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote: > Hi, > > On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell > wrote: > > Hi Thierry, > > > > Today's linux-next merge of the pwm tree got a conflict in: > > > > drivers/regulator/pwm-regulator.c > > > > between commit: > > > >

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

Hi, On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell wrote: > Hi Thierry, > > Today's linux-next merge of the pwm tree got a conflict in: > > drivers/regulator/pwm-regulator.c > > between commit: > > 830583004e61 ("regulator: pwm: Drop unneeded pwm_enable() call") >

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

Hi, On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell wrote: > Hi Thierry, > > Today's linux-next merge of the pwm tree got a conflict in: > > drivers/regulator/pwm-regulator.c > > between commit: > > 830583004e61 ("regulator: pwm: Drop unneeded pwm_enable() call") > 27bfa8893b15

linux-next: manual merge of the pwm tree with the regulator tree

Hi Thierry, Today's linux-next merge of the pwm tree got a conflict in: drivers/regulator/pwm-regulator.c between commit: 830583004e61 ("regulator: pwm: Drop unneeded pwm_enable() call") 27bfa8893b15 ("regulator: pwm: Support for enable GPIO") c2588393e631 ("regulator: pwm: Fix

linux-next: manual merge of the pwm tree with the regulator tree

Hi Thierry, Today's linux-next merge of the pwm tree got a conflict in: drivers/regulator/pwm-regulator.c between commit: 830583004e61 ("regulator: pwm: Drop unneeded pwm_enable() call") 27bfa8893b15 ("regulator: pwm: Support for enable GPIO") c2588393e631 ("regulator: pwm: Fix

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

On Tue, May 03, 2016 at 12:03:43PM +0100, Mark Brown wrote: > On Tue, May 03, 2016 at 06:25:09PM +1000, Stephen Rothwell wrote: > > > I fixed it up (see below) 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

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

On Tue, May 03, 2016 at 12:03:43PM +0100, Mark Brown wrote: > On Tue, May 03, 2016 at 06:25:09PM +1000, Stephen Rothwell wrote: > > > I fixed it up (see below) 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

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

On Tue, May 03, 2016 at 06:25:09PM +1000, Stephen Rothwell wrote: > I fixed it up (see below) 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 submitted

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

On Tue, May 03, 2016 at 06:25:09PM +1000, Stephen Rothwell wrote: > I fixed it up (see below) 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 submitted

linux-next: manual merge of the pwm tree with the regulator tree

Hi Thierry, Today's linux-next merge of the pwm tree got a conflict in: drivers/regulator/pwm-regulator.c between commit: fd786fb0276a ("regulator: pwm: Try to avoid voltage error in duty cycle calculation") from the regulator tree and commit: f137b90ba6cd ("regulator: pwm: Use

linux-next: manual merge of the pwm tree with the regulator tree

Hi Thierry, Today's linux-next merge of the pwm tree got a conflict in: drivers/regulator/pwm-regulator.c between commit: fd786fb0276a ("regulator: pwm: Try to avoid voltage error in duty cycle calculation") from the regulator tree and commit: f137b90ba6cd ("regulator: pwm: Use