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

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

[Stephen Rothwell]

[-- 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 --]

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

[Palmer Dabbelt]

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