linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree

linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 873 bytes --]

Hi all,

Today's linux-next merge of the generic-ioremap tree got a conflict in:

  drivers/platform/x86/intel_telemetry_pltdrv.c

between commit:

  ebc28a8e59ca ("platform/x86: intel_telemetry_pltdrv: use devm_platform_ioremap_resource()")

from the drivers-x86 tree and commit:

  4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")

from the generic-ioremap tree.

I fixed it up (the former removed th referneved to ioremap_nocache so
I just used that) 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.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree

[Andy Shevchenko]

On Fri, Jan 10, 2020 at 7:52 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the generic-ioremap tree got a conflict in:
>
>   drivers/platform/x86/intel_telemetry_pltdrv.c
>
> between commit:
>
>   ebc28a8e59ca ("platform/x86: intel_telemetry_pltdrv: use devm_platform_ioremap_resource()")
>
> from the drivers-x86 tree and commit:
>
>   4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
>
> from the generic-ioremap tree.
>
> I fixed it up (the former removed th referneved to ioremap_nocache so
> I just used that) 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.

Thanks, Stephen!
The conflict resolution looks correct to me.

>
>
>
> --
> Cheers,
> Stephen Rothwell



-- 
With Best Regards,
Andy Shevchenko

Re: linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]

Hi all,

On Fri, 10 Jan 2020 16:52:33 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the generic-ioremap tree got a conflict in:
> 
>   drivers/platform/x86/intel_telemetry_pltdrv.c
> 
> between commit:
> 
>   ebc28a8e59ca ("platform/x86: intel_telemetry_pltdrv: use devm_platform_ioremap_resource()")
> 
> from the drivers-x86 tree and commit:
> 
>   4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
> 
> from the generic-ioremap tree.
> 
> I fixed it up (the former removed th referneved to ioremap_nocache so
> I just used that) 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.

This is now a conflict between the driver-x86 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

Hi Andy,

On Tue, 28 Jan 2020 11:11:32 +0200 Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
>
> I can't reproduce this. Linus already pulled PR for PDx86,
> 
> $ git checkout -b test-xxx origin/master
> Branch 'test-xxx' set up to track remote branch 'master' from 'origin'.
> Switched to a new branch 'test-xxx'
> $ git merge for-next
> Already up to date.

Thanks for letting me know.  Sorry about the noise.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree

[Andy Shevchenko]

On Tue, Jan 28, 2020 at 1:03 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Fri, 24 Jan 2020 16:15:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the generic-ioremap tree got a conflict in:
> >
> >   drivers/platform/x86/intel_scu_ipc.c
> >
> > between commit:
> >
> >   74e9748b9b21 ("platform/x86: intel_scu_ipc: Drop intel_scu_ipc_i2c_cntrl()")
> >
> > from the drivers-x86 tree and commit:
> >
> >   4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
> >
> > from the generic-ioremap tree.
> >
> > I fixed it up (the former removed the code updated by the latter, so I
> > just did that) 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.
>
> This is now a conflict between the driver-x86 tree and Linus' tree.

I can't reproduce this. Linus already pulled PR for PDx86,

$ git checkout -b test-xxx origin/master
Branch 'test-xxx' set up to track remote branch 'master' from 'origin'.
Switched to a new branch 'test-xxx'
$ git merge for-next
Already up to date.



-- 
With Best Regards,
Andy Shevchenko

Re: linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1040 bytes --]

Hi all,

On Fri, 24 Jan 2020 16:15:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the generic-ioremap tree got a conflict in:
> 
>   drivers/platform/x86/intel_scu_ipc.c
> 
> between commit:
> 
>   74e9748b9b21 ("platform/x86: intel_scu_ipc: Drop intel_scu_ipc_i2c_cntrl()")
> 
> from the drivers-x86 tree and commit:
> 
>   4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
> 
> from the generic-ioremap tree.
> 
> I fixed it up (the former removed the code updated by the latter, so I
> just did that) 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.

This is now a conflict between the driver-x86 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 843 bytes --]

Hi all,

Today's linux-next merge of the generic-ioremap tree got a conflict in:

  drivers/platform/x86/intel_scu_ipc.c

between commit:

  74e9748b9b21 ("platform/x86: intel_scu_ipc: Drop intel_scu_ipc_i2c_cntrl()")

from the drivers-x86 tree and commit:

  4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")

from the generic-ioremap tree.

I fixed it up (the former removed the code updated by the latter, so I
just did that) 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]