From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>,
Masahiro Yamada <masahiroy@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Palmer Dabbelt <palmerdabbelt@google•com>,
Randy Dunlap <rdunlap@infradead•org>
Subject: linux-next: manual merge of the risc-v tree with the kbuild tree
Date: Mon, 25 Oct 2021 10:50:58 +1100 [thread overview]
Message-ID: <20211025105058.11bd58fe@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
arch/riscv/Makefile
between commit:
8212f8986d31 ("kbuild: use more subdir- for visiting subdirectories while cleaning")
from the kbuild tree and commit:
5d4595db0e1c ("riscv: add rv32 and rv64 randconfig build targets")
from the risc-v 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 arch/riscv/Makefile
index 753e13f3a9d2,9247407b95d6..000000000000
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@@ -135,3 -137,16 +135,13 @@@ zinstall: install-image = Image.g
install zinstall:
$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
$(boot)/$(install-image) System.map "$(INSTALL_PATH)"
+
-archclean:
- $(Q)$(MAKE) $(clean)=$(boot)
-
+ PHONY += rv32_randconfig
+ rv32_randconfig:
+ $(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/riscv/configs/32-bit.config \
+ -f $(srctree)/Makefile randconfig
+
+ PHONY += rv64_randconfig
+ rv64_randconfig:
+ $(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/riscv/configs/64-bit.config \
+ -f $(srctree)/Makefile randconfig
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2021-10-24 23:51 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=20211025105058.11bd58fe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmerdabbelt@google$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=rdunlap@infradead$(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