linux-kernel - linux-next: manual merge of the risc-v tree with the mm-hotfixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240815101714.4422f93c@canb.auug.org.au>
Date: Thu, 15 Aug 2024 10:17:14 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Palmer Dabbelt <palmer@...belt.com>, Paul Walmsley <paul@...an.com>,
 Andrew Morton <akpm@...ux-foundation.org>
Cc: Jinjie Ruan <ruanjinjie@...wei.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Palmer Dabbelt <palmer@...osinc.com>
Subject: linux-next: manual merge of the risc-v tree with the mm-hotfixes
 tree

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

Content of type "application/pgp-signature" skipped