From: broonie@kernel.org
To: Michael Ellerman <mpe@ellerman.id.au>,
PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the powerpc tree with the kbuild tree
Date: Thu, 29 Sep 2022 12:02:48 +0100 [thread overview]
Message-ID: <20220929110248.39712-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the powerpc tree got conflicts in:
arch/powerpc/Makefile
arch/powerpc/kernel/Makefile
between commits:
4f62512adbe9a ("kbuild: use obj-y instead extra-y for objects placed at the head")
0f17eda6118db ("kbuild: remove head-y syntax")
from the kbuild tree and commits:
dfc3095cec27f ("powerpc: Remove CONFIG_FSL_BOOKE")
688de017efaab ("powerpc: Change CONFIG_E500 to CONFIG_PPC_E500")
3e7318584dfec ("powerpc: Remove CONFIG_PPC_FSL_BOOK3E")
6556fd1a1e9fc ("powerpc: Cleanup idle for e500")
from the powerpc 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.
diff --cc arch/powerpc/Makefile
index 89c27827a11fb,19470d29de163..0000000000000
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
diff --cc arch/powerpc/kernel/Makefile
index ad3decb9f20ba,1f121c1888051..0000000000000
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@@ -118,12 -116,12 +116,12 @@@ obj-$(CONFIG_PPC_E500) += cpu_setup_e5
obj-$(CONFIG_PPC_DOORBELL) += dbell.o
obj-$(CONFIG_JUMP_LABEL) += jump_label.o
-extra-$(CONFIG_PPC64) := head_64.o
-extra-$(CONFIG_PPC_BOOK3S_32) := head_book3s_32.o
-extra-$(CONFIG_40x) := head_40x.o
-extra-$(CONFIG_44x) := head_44x.o
-extra-$(CONFIG_PPC_85xx) := head_85xx.o
-extra-$(CONFIG_PPC_8xx) := head_8xx.o
+obj-$(CONFIG_PPC64) += head_64.o
+obj-$(CONFIG_PPC_BOOK3S_32) += head_book3s_32.o
+obj-$(CONFIG_40x) += head_40x.o
+obj-$(CONFIG_44x) += head_44x.o
- obj-$(CONFIG_FSL_BOOKE) += head_fsl_booke.o
++obj-$(CONFIG_PPC_85xx) += head_85xx.o
+obj-$(CONFIG_PPC_8xx) += head_8xx.o
extra-y += vmlinux.lds
obj-$(CONFIG_RELOCATABLE) += reloc_$(BITS).o
next reply other threads:[~2022-09-29 11:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 11:02 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-03 22:16 linux-next: manual merge of the powerpc tree with the kbuild tree Stephen Rothwell
2022-10-09 22:17 ` Stephen Rothwell
2022-10-03 22:12 Stephen Rothwell
2022-10-09 22:16 ` Stephen Rothwell
2018-05-30 23:32 Stephen Rothwell
2018-06-07 23:52 ` Stephen Rothwell
2016-09-21 0:24 Stephen Rothwell
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=20220929110248.39712-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=masahiroy@kernel.org \
--cc=mpe@ellerman.id.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).