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

On Monday, October 29, 2018 3:09:25 AM CET Stephen Rothwell wrote: > > --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, > > Today's linux-next merge of the pm tree got conflicts in: > >

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

On Monday, October 29, 2018 3:09:25 AM CET Stephen Rothwell wrote: > > --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, > > Today's linux-next merge of the pm tree got conflicts in: > >

linux-next: manual merge of the pm tree with the i2c tree

Hi Rafael, Today's linux-next merge of the pm tree got conflicts in: drivers/i2c/busses/i2c-designware-baytrail.c drivers/i2c/busses/i2c-designware-core.h between commit: 9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C bus pm_disabled workaround") from the i2c tree and

linux-next: manual merge of the pm tree with the i2c tree

Hi Rafael, Today's linux-next merge of the pm tree got conflicts in: drivers/i2c/busses/i2c-designware-baytrail.c drivers/i2c/busses/i2c-designware-core.h between commit: 9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C bus pm_disabled workaround") from the i2c tree and

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

On Friday, January 12, 2018 12:27:29 AM CET Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in: > > drivers/i2c/busses/i2c-designware-platdrv.c > > between commit: > > 0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to >

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

On Friday, January 12, 2018 12:27:29 AM CET Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in: > > drivers/i2c/busses/i2c-designware-platdrv.c > > between commit: > > 0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to >

linux-next: manual merge of the pm tree with the i2c tree

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/i2c/busses/i2c-designware-platdrv.c between commit: 0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk") from the i2c tree and commit: 02e45646d53b ("PM:

linux-next: manual merge of the pm tree with the i2c tree

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/i2c/busses/i2c-designware-platdrv.c between commit: 0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk") from the i2c tree and commit: 02e45646d53b ("PM:

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

On Tue, Jul 19, 2016 at 6:48 AM, Wolfram Sang wrote: > >> > Well, not knowing much about ACPI, I just need the conflict resolution >> > for my latest i2c/for-next and your above branch. If you want to do it, >> > fine with me. But maybe Jarkko will be back to office on Monday,

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

On Tue, Jul 19, 2016 at 6:48 AM, Wolfram Sang wrote: > >> > Well, not knowing much about ACPI, I just need the conflict resolution >> > for my latest i2c/for-next and your above branch. If you want to do it, >> > fine with me. But maybe Jarkko will be back to office on Monday, too. >> >>

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

On Tuesday, July 19, 2016 05:48:07 AM Wolfram Sang wrote: > > > > Well, not knowing much about ACPI, I just need the conflict resolution > > > for my latest i2c/for-next and your above branch. If you want to do it, > > > fine with me. But maybe Jarkko will be back to office on Monday, too. > > >

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

On Tuesday, July 19, 2016 05:48:07 AM Wolfram Sang wrote: > > > > Well, not knowing much about ACPI, I just need the conflict resolution > > > for my latest i2c/for-next and your above branch. If you want to do it, > > > fine with me. But maybe Jarkko will be back to office on Monday, too. > > >

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

> > Well, not knowing much about ACPI, I just need the conflict resolution > > for my latest i2c/for-next and your above branch. If you want to do it, > > fine with me. But maybe Jarkko will be back to office on Monday, too. > > Unfortunately, I don't see how these branches can be merged in a

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

> > Well, not knowing much about ACPI, I just need the conflict resolution > > for my latest i2c/for-next and your above branch. If you want to do it, > > fine with me. But maybe Jarkko will be back to office on Monday, too. > > Unfortunately, I don't see how these branches can be merged in a

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

On Sunday, July 17, 2016 08:14:48 PM Wolfram Sang wrote: > > > > > > > I fixed it up (I think, but it needs more work - see below) and can > > > > > > > > > > For a start, it generates this warning, now: > > > > > > > > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined

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

On Sunday, July 17, 2016 08:14:48 PM Wolfram Sang wrote: > > > > > > > I fixed it up (I think, but it needs more work - see below) and can > > > > > > > > > > For a start, it generates this warning, now: > > > > > > > > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined

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

> > > > > I fixed it up (I think, but it needs more work - see below) and can > > > > > > > > For a start, it generates this warning, now: > > > > > > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined > > > > but not used [-Wunused-function] > > > > static acpi_status

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

> > > > > I fixed it up (I think, but it needs more work - see below) and can > > > > > > > > For a start, it generates this warning, now: > > > > > > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined > > > > but not used [-Wunused-function] > > > > static acpi_status

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

On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote: > On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote: > > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote: > > > Hi all, > > > > > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell > > >

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

On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote: > On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote: > > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote: > > > Hi all, > > > > > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell > > > wrote: > > > > > > >

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

On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote: > On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote: > > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote: > > > Hi all, > > > > > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell > > >

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

On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote: > On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote: > > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote: > > > Hi all, > > > > > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell > > > wrote: > > > > > > >

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

On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote: > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote: > > Hi all, > > > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell > > wrote: > > > > > > I fixed it up (I think, but it needs more work

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

On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote: > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote: > > Hi all, > > > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell > > wrote: > > > > > > I fixed it up (I think, but it needs more work - see below) and can >

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

On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote: > Hi all, > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell > wrote: > > > > I fixed it up (I think, but it needs more work - see below) and can > > For a start, it generates this warning, now: > >

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

On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote: > Hi all, > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell > wrote: > > > > I fixed it up (I think, but it needs more work - see below) and can > > For a start, it generates this warning, now: > >

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

Hi all, On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell wrote: > > I fixed it up (I think, but it needs more work - see below) and can For a start, it generates this warning, now: drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not used

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

Hi all, On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell wrote: > > I fixed it up (I think, but it needs more work - see below) and can For a start, it generates this warning, now: drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not used [-Wunused-function]

linux-next: manual merge of the pm tree with the i2c tree

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/i2c/i2c-core.c between commit: a7003b65801e ("i2c: core: Cleanup I2C ACPI namespace") 55d38d060e99 ("i2c: core: Add function for finding the bus speed from ACPI") from the i2c tree and commit: 525e6fabeae2

linux-next: manual merge of the pm tree with the i2c tree

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/i2c/i2c-core.c between commit: a7003b65801e ("i2c: core: Cleanup I2C ACPI namespace") 55d38d060e99 ("i2c: core: Add function for finding the bus speed from ACPI") from the i2c tree and commit: 525e6fabeae2

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

> > I fixed it up (see below) and can carry the fix as necessary (no action > > is required). > > Looks good to me and thanks for taking care of this! Ditto. Thanks! signature.asc Description: Digital signature

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

> > I fixed it up (see below) and can carry the fix as necessary (no action > > is required). > > Looks good to me and thanks for taking care of this! Ditto. Thanks! signature.asc Description: Digital signature

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

On Wednesday, January 06, 2016 12:39:11 PM Stephen Rothwell wrote: > Hi Rafael, Hi, > Today's linux-next merge of the pm tree got a conflict in: > > drivers/i2c/busses/i2c-designware-platdrv.c > > between commit: > > 90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C") > >

linux-next: manual merge of the pm tree with the i2c tree

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/i2c/busses/i2c-designware-platdrv.c between commit: 90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C") from the i2c tree and commit: a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device

linux-next: manual merge of the pm tree with the i2c tree

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/i2c/busses/i2c-designware-platdrv.c between commit: 90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C") from the i2c tree and commit: a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device

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

On Wednesday, January 06, 2016 12:39:11 PM Stephen Rothwell wrote: > Hi Rafael, Hi, > Today's linux-next merge of the pm tree got a conflict in: > > drivers/i2c/busses/i2c-designware-platdrv.c > > between commit: > > 90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C") > >