From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chanwoo Choi <cw00.choi@samsung.com>,
Bumwoo Lee <bw365.lee@samsung.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the extcon tree with the driver-core tree
Date: Mon, 20 Mar 2023 13:15:09 +0100 [thread overview]
Message-ID: <ZBhOTW9v9jzJVY7e@kroah.com> (raw)
In-Reply-To: <20230320115839.5e645bb0@canb.auug.org.au>
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
prev parent reply other threads:[~2023-03-20 12:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 0:58 linux-next: manual merge of the extcon tree with the driver-core tree Stephen Rothwell
2023-03-20 12:15 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZBhOTW9v9jzJVY7e@kroah.com \
--to=greg@kroah.com \
--cc=bw365.lee@samsung.com \
--cc=cw00.choi@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).