On Mon, Mar 20, 2023 at 11:58:39AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the extcon tree got a conflict in:
>
> drivers/extcon/extcon.c
>
> between commit:
>
> 1aaba11da9aa ("driver core: class: remove module * from class_create()")
>
> from the driver-core tree and commit:
>
> 6384c02f33a9 ("extcon: Remove redundant null checking for class")
>
> from the extcon 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/extcon/extcon.c
> index d43ba8e7260d,adcf01132f70..000000000000
> --- a/drivers/extcon/extcon.c
> +++ b/drivers/extcon/extcon.c
> @@@ -1012,12 -1012,13 +1012,13 @@@ ATTRIBUTE_GROUPS(extcon)
>
> static int create_extcon_class(void)
> {
> - if (!extcon_class) {
> - extcon_class = class_create("extcon");
> - if (IS_ERR(extcon_class))
> - return PTR_ERR(extcon_class);
> - extcon_class->dev_groups = extcon_groups;
> - }
> + if (extcon_class)
> + return 0;
> +
> - extcon_class = class_create(THIS_MODULE, "extcon");
> ++ extcon_class = class_create("extcon");
> + if (IS_ERR(extcon_class))
> + return PTR_ERR(extcon_class);
> + extcon_class->dev_groups = extcon_groups;
>
> return 0;
> }
Thanks, the merge resolution looks good to me.
greg k-h
