From: Mark Brown <broonie@kernel•org>
To: Chanwoo Choi <cw00.choi@samsung•com>
Cc: "Linus Torvalds" <torvalds@linux-foundation•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Uwe Kleine-König" <ukleinek@kernel•org>,
"Uwe Kleine-König" <u.kleine-koenig@baylibre•com>
Subject: linux-next: manual merge of the extcon tree with the origin tree
Date: Fri, 6 Dec 2024 13:46:05 +0000 [thread overview]
Message-ID: <Z1MAHZOgRInwoyZi@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 769 bytes --]
Hi all,
Today's linux-next merge of the extcon tree got a conflict in:
drivers/extcon/extcon-usbc-cros-ec.c
between commit:
e70140ba0d2b1 ("Get rid of 'remove_new' relic from platform driver struct")
from the origin tree and commit:
a5bca5c3931ba ("extcon: Switch back to struct platform_driver::remove()")
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.
(no diff, used Linus' version.)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2024-12-06 13:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=Z1MAHZOgRInwoyZi@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=cw00.choi@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=u.kleine-koenig@baylibre$(echo .)com \
--cc=ukleinek@kernel$(echo .)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