From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
Rob Herring <robherring2@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Rob Herring <robh@kernel.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: linux-next: manual merge of the char-misc tree with the devicetree tree
Date: Tue, 11 Apr 2023 13:57:28 +1000 [thread overview]
Message-ID: <20230411135728.07539d81@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/of/Makefile
between commit:
bac06718990c ("of: Move CPU node related functions to their own file")
from the devicetree tree and commit:
bd7a7ed774af ("of: Move of_modalias() to module.c")
from the char-misc 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/of/Makefile
index 10f704592561,ae9923fd2940..000000000000
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@@ -1,5 -1,5 +1,5 @@@
# SPDX-License-Identifier: GPL-2.0
- obj-y = base.o cpu.o device.o platform.o property.o
-obj-y = base.o device.o module.o platform.o property.o
++obj-y = base.o cpu.o device.o module.o platform.o property.o
obj-$(CONFIG_OF_KOBJ) += kobj.o
obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
obj-$(CONFIG_OF_FLATTREE) += fdt.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-04-11 3:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-11 3:57 Stephen Rothwell [this message]
2023-04-11 7:33 ` linux-next: manual merge of the char-misc tree with the devicetree tree Greg KH
2023-04-11 7:41 ` Miquel Raynal
2023-04-14 15:13 broonie
2023-04-15 5:52 ` 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=20230411135728.07539d81@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=robh@kernel.org \
--cc=robherring2@gmail.com \
--cc=srinivas.kandagatla@linaro.org \
/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).