From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Guo Ren <ren_guo@c-sky.com>
Cc: Anup Patel <anup.patel@wdc.com>, Anup Patel <anup@brainfault.org>,
Guo Ren <guoren@kernel.org>, Guo Ren <guoren@linux.alibaba.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Palmer Dabbelt <palmer@rivosinc.com>
Subject: linux-next: manual merge of the csky tree with Linus' tree
Date: Mon, 4 Apr 2022 08:24:07 +1000 [thread overview]
Message-ID: <20220404082320.1a397088@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1164 bytes --]
Hi all,
Today's linux-next merge of the csky tree got a conflict in:
arch/riscv/configs/rv32_defconfig
between commits:
d56201d9440d ("riscv: defconfig: enable hugetlbfs option")
f6e64b66629e ("RISC-V: Enable CPU_IDLE drivers")
c5179ef1ca0c ("RISC-V: Enable RISC-V SBI CPU Idle driver for QEMU virt machine")
2e7451fb5763 ("RISC-V: Enable profiling by default")
6f562570b9c5 ("RISC-V: defconfig: Drop redundant SBI HVC and earlycon")
from Linus' tree and commit:
0f6ffeaeed8f ("riscv: Fixup difference with defconfig")
from the csky 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.
I am trying to figure out why all these commits affecting the riscv
architecture have suddenly turned up in the csky tree (and just before
the merge window closed).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-04-03 22:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-03 22:24 Stephen Rothwell [this message]
[not found] <CAJF2gTRc-NtpRS4ScQbgZAzN+thSejRXgHUuPwm3avYOCpPX2w@mail.gmail.com>
2022-04-04 23:06 ` linux-next: manual merge of the csky tree with Linus' tree Palmer Dabbelt
-- strict thread matches above, loose matches on Subject: below --
2022-04-03 22:14 Stephen Rothwell
2020-04-03 23:13 Stephen Rothwell
2020-01-05 22:20 Stephen Rothwell
2020-01-06 15:46 ` Guo Ren
2019-01-06 23:27 Stephen Rothwell
2019-01-07 6:53 ` Christoph Hellwig
2019-01-07 10:30 ` 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=20220404082320.1a397088@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=anup.patel@wdc.com \
--cc=anup@brainfault.org \
--cc=guoren@kernel.org \
--cc=guoren@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=palmer@rivosinc.com \
--cc=ren_guo@c-sky.com \
/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).