From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Jinjie Ruan <ruanjinjie@huawei•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 risc-v tree with the mm-hotfixes tree
Date: Thu, 15 Aug 2024 10:17:14 +1000 [thread overview]
Message-ID: <20240815101714.4422f93c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 793 bytes --]
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
kernel/crash_reserve.c
between commit:
ce24afb8be8f ("crash: fix riscv64 crash memory reserve dead loop")
from the mm-hotfixes tree and commit:
e2acf68fb1c5 ("crash: Fix riscv64 crash memory reserve dead loop")
from the risc-v tree.
I fixed it up (I used the former one as it seems to be a more recent
patch) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-08-15 0:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-15 0:17 Stephen Rothwell [this message]
2024-08-15 0:46 ` linux-next: manual merge of the risc-v tree with the mm-hotfixes tree Palmer Dabbelt
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=20240815101714.4422f93c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmer@rivosinc$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=ruanjinjie@huawei$(echo .)com \
/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