linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <mhng-e24991b6-0573-4c36-ac15-bf92a8fa6408@palmer-ri-x1c9>
Date: Wed, 14 Aug 2024 17:46:56 -0700 (PDT)
From: Palmer Dabbelt <palmer@...belt.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: Paul Walmsley <paul@...an.com>, akpm@...ux-foundation.org, ruanjinjie@...wei.com,
  linux-kernel@...r.kernel.org, linux-next@...r.kernel.org
Subject:     Re: linux-next: manual merge of the risc-v tree with the mm-hotfixes tree

On Wed, 14 Aug 2024 17:17:14 PDT (-0700), Stephen Rothwell wrote:
> 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.

Sorry, I think I picked that one up by accident (just saw RISC-V in the 
name and didn't notice it wasn't for my tree).   I pushed my staging 
tree to for-next this morning before having my coffee, I bet I'd just 
forgotten to drop it locally as it'd been sitting there for a week.

It's gone now.

>
> -- 
> Cheers,
> Stephen Rothwell