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

[Rafael J. Wysocki]

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:
> 
>   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_disab=
> led workaround")
> 
> from the i2c tree and commit:
> 
>   8afb46804dfa ("i2c: designware: Cleanup bus lock handling")
> 
> from the pm tree.
> 
> 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 for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> --=20
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/i2c/busses/i2c-designware-baytrail.c
> index 9ca1feaba98f,971b5cde7a93..
> --- a/drivers/i2c/busses/i2c-designware-baytrail.c
> +++ b/drivers/i2c/busses/i2c-designware-baytrail.c
> @@@ -162,18 -36,9 +36,9 @@@ int i2c_dw_probe_lock_support(struct dw
>   return -EPROBE_DEFER;
>  =20
>   dev_info(dev->dev, "I2C bus managed by PUNIT\n");
> - dev->acquire_lock =3D baytrail_i2c_acquire;
> - dev->release_lock =3D baytrail_i2c_release;
> + dev->acquire_lock =3D iosf_mbi_block_punit_i2c_access;
> + dev->release_lock =3D iosf_mbi_unblock_punit_i2c_access;
>  -dev->pm_disabled =3D true;
>  +dev->shared_with_punit =3D true;
>  =20
> - pm_qos_add_request(>pm_qos, PM_QOS_CPU_DMA_LATENCY,
> -PM_QOS_DEFAULT_VALUE);
> -=20
>   return 0;
>   }
> -=20
> - void i2c_dw_remove_lock_support(struct dw_i2c_dev *dev)
> - {
> - if (dev->acquire_lock)
> - pm_qos_remove_request(>pm_qos);
> - }
> diff --cc drivers/i2c/busses/i2c-designware-core.h
> index 9ec8394f4787,152bf56d8404..
> --- a/drivers/i2c/busses/i2c-designware-core.h
> +++ b/drivers/i2c/busses/i2c-designware-core.h
> @@@ -209,10 -208,9 +208,9 @@@
>* @fp_lcnt: fast plus LCNT value
>* @hs_hcnt: high speed HCNT value
>* @hs_lcnt: high speed LCNT value
> -  * @pm_qos: pm_qos_request used while holding a hardware lock on the bus
>* @acquire_lock: function to acquire a hardware lock on the bus
>* @release_lock: function to release a hardware lock on the bus
>  - * @pm_disabled: true if power-management should be disabled for this i2c=
> -bus
>  + * @shared_with_punit: true if this bus is shared with the SoCs PUNIT
>* @disable: function to disable the controller
>* @disable_int: function to disable all interrupts
>* @init: function to initialize the I2C hardware
> @@@ -263,10 -260,9 +261,9 @@@ struct dw_i2c_dev=20
>   u16 fp_lcnt;
>   u16 hs_hcnt;
>   u16 hs_lcnt;
> - struct pm_qos_request   pm_qos;
> - int (*acquire_lock)(struct dw_i2c_dev *dev);
> - void(*release_lock)(struct dw_i2c_dev *dev);
> + int (*acquire_lock)(void);
> + void(*release_lock)(void);
>  -boolpm_disabled;
>  +boolshared_with_punit;
>   void(*disable)(struct dw_i2c_dev *dev);
>   void(*disable_int)(struct dw_i2c_dev *dev);
>   int (*init)(struct dw_i2c_dev *dev);
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk
> Content-Type: application/pgp-signature
> Content-Description: OpenPGP digital signature
> 
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk--
> 

The fix looks good to me, thanks!

Cheers,
Rafael

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

[Rafael J. Wysocki]

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:
> 
>   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_disab=
> led workaround")
> 
> from the i2c tree and commit:
> 
>   8afb46804dfa ("i2c: designware: Cleanup bus lock handling")
> 
> from the pm tree.
> 
> 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 for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> --=20
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/i2c/busses/i2c-designware-baytrail.c
> index 9ca1feaba98f,971b5cde7a93..
> --- a/drivers/i2c/busses/i2c-designware-baytrail.c
> +++ b/drivers/i2c/busses/i2c-designware-baytrail.c
> @@@ -162,18 -36,9 +36,9 @@@ int i2c_dw_probe_lock_support(struct dw
>   return -EPROBE_DEFER;
>  =20
>   dev_info(dev->dev, "I2C bus managed by PUNIT\n");
> - dev->acquire_lock =3D baytrail_i2c_acquire;
> - dev->release_lock =3D baytrail_i2c_release;
> + dev->acquire_lock =3D iosf_mbi_block_punit_i2c_access;
> + dev->release_lock =3D iosf_mbi_unblock_punit_i2c_access;
>  -dev->pm_disabled =3D true;
>  +dev->shared_with_punit =3D true;
>  =20
> - pm_qos_add_request(>pm_qos, PM_QOS_CPU_DMA_LATENCY,
> -PM_QOS_DEFAULT_VALUE);
> -=20
>   return 0;
>   }
> -=20
> - void i2c_dw_remove_lock_support(struct dw_i2c_dev *dev)
> - {
> - if (dev->acquire_lock)
> - pm_qos_remove_request(>pm_qos);
> - }
> diff --cc drivers/i2c/busses/i2c-designware-core.h
> index 9ec8394f4787,152bf56d8404..
> --- a/drivers/i2c/busses/i2c-designware-core.h
> +++ b/drivers/i2c/busses/i2c-designware-core.h
> @@@ -209,10 -208,9 +208,9 @@@
>* @fp_lcnt: fast plus LCNT value
>* @hs_hcnt: high speed HCNT value
>* @hs_lcnt: high speed LCNT value
> -  * @pm_qos: pm_qos_request used while holding a hardware lock on the bus
>* @acquire_lock: function to acquire a hardware lock on the bus
>* @release_lock: function to release a hardware lock on the bus
>  - * @pm_disabled: true if power-management should be disabled for this i2c=
> -bus
>  + * @shared_with_punit: true if this bus is shared with the SoCs PUNIT
>* @disable: function to disable the controller
>* @disable_int: function to disable all interrupts
>* @init: function to initialize the I2C hardware
> @@@ -263,10 -260,9 +261,9 @@@ struct dw_i2c_dev=20
>   u16 fp_lcnt;
>   u16 hs_hcnt;
>   u16 hs_lcnt;
> - struct pm_qos_request   pm_qos;
> - int (*acquire_lock)(struct dw_i2c_dev *dev);
> - void(*release_lock)(struct dw_i2c_dev *dev);
> + int (*acquire_lock)(void);
> + void(*release_lock)(void);
>  -boolpm_disabled;
>  +boolshared_with_punit;
>   void(*disable)(struct dw_i2c_dev *dev);
>   void(*disable_int)(struct dw_i2c_dev *dev);
>   int (*init)(struct dw_i2c_dev *dev);
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk
> Content-Type: application/pgp-signature
> Content-Description: OpenPGP digital signature
> 
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk--
> 

The fix looks good to me, thanks!

Cheers,
Rafael

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

[Rafael J. Wysocki]

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 
> i2c_dw_prepare_clk")
> 
> from the i2c tree and commit:
> 
>   02e45646d53b ("PM: i2c-designware-platdrv: Optimize power management")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks good to me.

Thanks!

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

[Rafael J. Wysocki]

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 
> i2c_dw_prepare_clk")
> 
> from the i2c tree and commit:
> 
>   02e45646d53b ("PM: i2c-designware-platdrv: Optimize power management")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks good to me.

Thanks!

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

[Andy Shevchenko]

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.
>>
>> Unfortunately, I don't see how these branches can be merged in a sensible
>> way without adding too much new code into the merge itself.
>>
>> Something needs to be dropped and then rebased and applied again.
>
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.

Jarkko and Mika are on holidays, I recently noticed this thread,
sorry. For now your solution seems okay, since we can't push broken
parts into v4.8-rc1.

-- 
With Best Regards,
Andy Shevchenko

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

[Andy Shevchenko]

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.
>>
>> Unfortunately, I don't see how these branches can be merged in a sensible
>> way without adding too much new code into the merge itself.
>>
>> Something needs to be dropped and then rebased and applied again.
>
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.

Jarkko and Mika are on holidays, I recently noticed this thread,
sorry. For now your solution seems okay, since we can't push broken
parts into v4.8-rc1.

-- 
With Best Regards,
Andy Shevchenko

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

[Rafael J. Wysocki]

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.
> > 
> > Unfortunately, I don't see how these branches can be merged in a sensible
> > way without adding too much new code into the merge itself.
> > 
> > Something needs to be dropped and then rebased and applied again.
> 
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.

Thanks a lot!

> Thanks for looking into it!

No problem.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

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

[Rafael J. Wysocki]

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.
> > 
> > Unfortunately, I don't see how these branches can be merged in a sensible
> > way without adding too much new code into the merge itself.
> > 
> > Something needs to be dropped and then rebased and applied again.
> 
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.

Thanks a lot!

> Thanks for looking into it!

No problem.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

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

[Wolfram Sang]

> > 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 sensible
> way without adding too much new code into the merge itself.
> 
> Something needs to be dropped and then rebased and applied again.

Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
there was also a driver patch making use of the core changes for which I
requested some updates. Since those did not happen yet (Jarkko on
holiday?), the core patches alone are not important anyhow.

Thanks for looking into it!

   Wolfram



signature.asc
Description: PGP signature

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

[Wolfram Sang]

> > 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 sensible
> way without adding too much new code into the merge itself.
> 
> Something needs to be dropped and then rebased and applied again.

Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
there was also a driver patch making use of the core changes for which I
requested some updates. Since those did not happen yet (Jarkko on
holiday?), the core patches alone are not important anyhow.

Thanks for looking into it!

   Wolfram



signature.asc
Description: PGP signature

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

[Rafael J. Wysocki]

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 
> > > > > but not used [-Wunused-function]
> > > > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > > > >^
> > > > 
> > > > OK, thanks for the heads-up.
> > > 
> > > Yes, thanks!
> > > 
> > > > 
> > > > Wolfram, what about if I exposed my "acpi-tables" branch for you to 
> > > > pull?
> > > > 
> > > > You could resolve this in your tree then.
> > > 
> > > I can pull it in, sure. For the fixup, I'd like a commitment from one of
> > > the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> > > revert given that we are quite late in the cycle already.
> > 
> > The branch is here:
> > 
> >  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git 
> > acpi-tables
> > 
> > The top-most commit is:
> > 
> > fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link 
> > error
> > 
> > I won't rebase this branch going forward, so it is safe to pull.
> > 
> > Please let me know how I can help with the conflict resolution.
> 
> 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 sensible
way without adding too much new code into the merge itself.

Something needs to be dropped and then rebased and applied again.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

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

[Rafael J. Wysocki]

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 
> > > > > but not used [-Wunused-function]
> > > > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > > > >^
> > > > 
> > > > OK, thanks for the heads-up.
> > > 
> > > Yes, thanks!
> > > 
> > > > 
> > > > Wolfram, what about if I exposed my "acpi-tables" branch for you to 
> > > > pull?
> > > > 
> > > > You could resolve this in your tree then.
> > > 
> > > I can pull it in, sure. For the fixup, I'd like a commitment from one of
> > > the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> > > revert given that we are quite late in the cycle already.
> > 
> > The branch is here:
> > 
> >  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git 
> > acpi-tables
> > 
> > The top-most commit is:
> > 
> > fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link 
> > error
> > 
> > I won't rebase this branch going forward, so it is safe to pull.
> > 
> > Please let me know how I can help with the conflict resolution.
> 
> 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 sensible
way without adding too much new code into the merge itself.

Something needs to be dropped and then rebased and applied again.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

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

[Wolfram Sang]

> > > > > 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 i2c_acpi_add_device(acpi_handle handle, u32 level,
> > > >^
> > > 
> > > OK, thanks for the heads-up.
> > 
> > Yes, thanks!
> > 
> > > 
> > > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > > 
> > > You could resolve this in your tree then.
> > 
> > I can pull it in, sure. For the fixup, I'd like a commitment from one of
> > the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> > revert given that we are quite late in the cycle already.
> 
> The branch is here:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-tables
> 
> The top-most commit is:
> 
> fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link error
> 
> I won't rebase this branch going forward, so it is safe to pull.
> 
> Please let me know how I can help with the conflict resolution.

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.



signature.asc
Description: PGP signature

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

[Wolfram Sang]

> > > > > 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 i2c_acpi_add_device(acpi_handle handle, u32 level,
> > > >^
> > > 
> > > OK, thanks for the heads-up.
> > 
> > Yes, thanks!
> > 
> > > 
> > > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > > 
> > > You could resolve this in your tree then.
> > 
> > I can pull it in, sure. For the fixup, I'd like a commitment from one of
> > the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> > revert given that we are quite late in the cycle already.
> 
> The branch is here:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-tables
> 
> The top-most commit is:
> 
> fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link error
> 
> I won't rebase this branch going forward, so it is safe to pull.
> 
> Please let me know how I can help with the conflict resolution.

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.



signature.asc
Description: PGP signature

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

[Rafael J. Wysocki]

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:
> > > >
> > > > 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 i2c_acpi_add_device(acpi_handle handle, u32 level,
> > >^
> > 
> > OK, thanks for the heads-up.
> 
> Yes, thanks!
> 
> > 
> > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > 
> > You could resolve this in your tree then.
> 
> I can pull it in, sure. For the fixup, I'd like a commitment from one of
> the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> revert given that we are quite late in the cycle already.

The branch is here:

 git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-tables

The top-most commit is:

fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link error

I won't rebase this branch going forward, so it is safe to pull.

Please let me know how I can help with the conflict resolution.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

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

[Rafael J. Wysocki]

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:
> > > >
> > > > 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 i2c_acpi_add_device(acpi_handle handle, u32 level,
> > >^
> > 
> > OK, thanks for the heads-up.
> 
> Yes, thanks!
> 
> > 
> > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > 
> > You could resolve this in your tree then.
> 
> I can pull it in, sure. For the fixup, I'd like a commitment from one of
> the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> revert given that we are quite late in the cycle already.

The branch is here:

 git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-tables

The top-most commit is:

fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link error

I won't rebase this branch going forward, so it is safe to pull.

Please let me know how I can help with the conflict resolution.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

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

[Rafael J. Wysocki]

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:
> > > >
> > > > 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 i2c_acpi_add_device(acpi_handle handle, u32 level,
> > >^
> > 
> > OK, thanks for the heads-up.
> 
> Yes, thanks!
> 
> > 
> > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > 
> > You could resolve this in your tree then.
> 
> I can pull it in, sure. For the fixup, I'd like a commitment from one of
> the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> revert given that we are quite late in the cycle already.

Well, I can help with that too, I suppose.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

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

[Rafael J. Wysocki]

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:
> > > >
> > > > 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 i2c_acpi_add_device(acpi_handle handle, u32 level,
> > >^
> > 
> > OK, thanks for the heads-up.
> 
> Yes, thanks!
> 
> > 
> > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > 
> > You could resolve this in your tree then.
> 
> I can pull it in, sure. For the fixup, I'd like a commitment from one of
> the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> revert given that we are quite late in the cycle already.

Well, I can help with that too, I suppose.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

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

[Wolfram Sang]

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
> > 
> > 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 i2c_acpi_add_device(acpi_handle handle, u32 level,
> >^
> 
> OK, thanks for the heads-up.

Yes, thanks!

> 
> Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> 
> You could resolve this in your tree then.

I can pull it in, sure. For the fixup, I'd like a commitment from one of
the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
revert given that we are quite late in the cycle already.



signature.asc
Description: PGP signature

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

[Wolfram Sang]

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
> > 
> > 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 i2c_acpi_add_device(acpi_handle handle, u32 level,
> >^
> 
> OK, thanks for the heads-up.

Yes, thanks!

> 
> Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> 
> You could resolve this in your tree then.

I can pull it in, sure. For the fixup, I'd like a commitment from one of
the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
revert given that we are quite late in the cycle already.



signature.asc
Description: PGP signature

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

[Rafael J. Wysocki]

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:
> 
> drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not 
> used [-Wunused-function]
> static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
>^

OK, thanks for the heads-up.

Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?

You could resolve this in your tree then.

Thanks,
Rafael

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

[Rafael J. Wysocki]

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:
> 
> drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not 
> used [-Wunused-function]
> static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
>^

OK, thanks for the heads-up.

Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?

You could resolve this in your tree then.

Thanks,
Rafael

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

[Stephen Rothwell]

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]
static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
   ^

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

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]
static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
   ^

-- 
Cheers,
Stephen Rothwell

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

[Wolfram Sang]

> > 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

[Wolfram Sang]

> > 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

[Rafael J. Wysocki]

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")
> 
> from the i2c tree and commit:
> 
>   a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
> 
> from the pm 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!

Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

[Rafael J. Wysocki]

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")
> 
> from the i2c tree and commit:
> 
>   a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
> 
> from the pm 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!

Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/