From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Chanwoo Choi <cw00.choi@samsung•com>, Greg KH <greg@kroah•com>
Cc: Bumwoo Lee <bw365.lee@samsung•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the extcon tree with the driver-core tree
Date: Mon, 20 Mar 2023 11:58:39 +1100 [thread overview]
Message-ID: <20230320115839.5e645bb0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]
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;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-03-20 1:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 0:58 Stephen Rothwell [this message]
2023-03-20 12:15 ` linux-next: manual merge of the extcon tree with the driver-core tree Greg KH
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=20230320115839.5e645bb0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bw365.lee@samsung$(echo .)com \
--cc=cw00.choi@samsung$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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