linux-next: manual merge of the driver-core tree with the mm tree

linux-next: manual merge of the driver-core tree with the mm tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/fsi/fsi-occ.c

between commit:

  2d2bf1e680a9 ("fsi: occ: remove usage of the deprecated ida_simple_xx() API")

from the mm-nonmm-unstable branch of the mm tree and commit:

  29f102dbb11f ("fsi: occ: Convert to platform remove callback returning void")

from the driver-core 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/fsi/fsi-occ.c
index f7157c1d77d8,21d2666c4195..000000000000
--- a/drivers/fsi/fsi-occ.c
+++ b/drivers/fsi/fsi-occ.c
@@@ -718,9 -719,7 +718,7 @@@ static void occ_remove(struct platform_
  	else
  		device_for_each_child(&pdev->dev, NULL, occ_unregister_of_child);
  
 -	ida_simple_remove(&occ_ida, occ->idx);
 +	ida_free(&occ_ida, occ->idx);
- 
- 	return 0;
  }
  
  static const struct of_device_id occ_match[] = {

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

Re: linux-next: manual merge of the driver-core tree with the mm tree

[Uwe Kleine-König]

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

Hello Stephen,

On Wed, Jun 12, 2024 at 12:36:40PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/fsi/fsi-occ.c
> 
> between commit:
> 
>   2d2bf1e680a9 ("fsi: occ: remove usage of the deprecated ida_simple_xx() API")
> 
> from the mm-nonmm-unstable branch of the mm tree and commit:
> 
>   29f102dbb11f ("fsi: occ: Convert to platform remove callback returning void")
> 
> from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> [...]
> 
> diff --cc drivers/fsi/fsi-occ.c
> index f7157c1d77d8,21d2666c4195..000000000000
> --- a/drivers/fsi/fsi-occ.c
> +++ b/drivers/fsi/fsi-occ.c
> @@@ -718,9 -719,7 +718,7 @@@ static void occ_remove(struct platform_
>   	else
>   		device_for_each_child(&pdev->dev, NULL, occ_unregister_of_child);
>   
>  -	ida_simple_remove(&occ_ida, occ->idx);
>  +	ida_free(&occ_ida, occ->idx);
> - 
> - 	return 0;
>   }
>   
>   static const struct of_device_id occ_match[] = {

that looks correct to me. Thanks for caring!

Best regards
Uwe

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

Re: linux-next: manual merge of the driver-core tree with the mm tree

[Stephen Rothwell]

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

Hi all,

On Wed, 12 Jun 2024 12:36:40 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/fsi/fsi-occ.c
> 
> between commit:
> 
>   2d2bf1e680a9 ("fsi: occ: remove usage of the deprecated ida_simple_xx() API")
> 
> from the mm-nonmm-unstable branch of the mm tree and commit:
> 
>   29f102dbb11f ("fsi: occ: Convert to platform remove callback returning void")
> 
> from the driver-core 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.
> 
> diff --cc drivers/fsi/fsi-occ.c
> index f7157c1d77d8,21d2666c4195..000000000000
> --- a/drivers/fsi/fsi-occ.c
> +++ b/drivers/fsi/fsi-occ.c
> @@@ -718,9 -719,7 +718,7 @@@ static void occ_remove(struct platform_
>   	else
>   		device_for_each_child(&pdev->dev, NULL, occ_unregister_of_child);
>   
>  -	ida_simple_remove(&occ_ida, occ->idx);
>  +	ida_free(&occ_ida, occ->idx);
> - 
> - 	return 0;
>   }
>   
>   static const struct of_device_id occ_match[] = {

This conflict is now between the driver-core 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 driver-core tree with the mm tree

[Greg KH]

On Wed, Jul 24, 2024 at 08:57:21AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 12 Jun 2024 12:36:40 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > Today's linux-next merge of the driver-core tree got a conflict in:
> > 
> >   drivers/fsi/fsi-occ.c
> > 
> > between commit:
> > 
> >   2d2bf1e680a9 ("fsi: occ: remove usage of the deprecated ida_simple_xx() API")
> > 
> > from the mm-nonmm-unstable branch of the mm tree and commit:
> > 
> >   29f102dbb11f ("fsi: occ: Convert to platform remove callback returning void")
> > 
> > from the driver-core 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.
> > 
> > diff --cc drivers/fsi/fsi-occ.c
> > index f7157c1d77d8,21d2666c4195..000000000000
> > --- a/drivers/fsi/fsi-occ.c
> > +++ b/drivers/fsi/fsi-occ.c
> > @@@ -718,9 -719,7 +718,7 @@@ static void occ_remove(struct platform_
> >   	else
> >   		device_for_each_child(&pdev->dev, NULL, occ_unregister_of_child);
> >   
> >  -	ida_simple_remove(&occ_ida, occ->idx);
> >  +	ida_free(&occ_ida, occ->idx);
> > - 
> > - 	return 0;
> >   }
> >   
> >   static const struct of_device_id occ_match[] = {
> 
> This conflict is now between the driver-core tree and Linus tree.

Yeah, there's lots of conflicts now, I was waiting for all of these to
be merged before submitting my pull request.  I'll do some test builds
here locally today before submitting it with links to these resolutions
to give Linus a hint of what to do.

thanks,

greg k-h