Re: linux-next: manual merge of the tip tree with the efi-fixes tree

[Stephen Rothwell]

Hi all,

On Thu, 19 Oct 2023 14:54:04 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/firmware/efi/libstub/x86-stub.c
> 
> between commit:
> 
>   db7724134c26 ("x86/boot: efistub: Assign global boot_params variable")
> 
> from the efi-fixes tree and commit:
> 
>   50dcc2e0d62e ("x86/boot: efistub: Assign global boot_params variable")
> 
> from the tip tree.
> 
> I fixed it up (I just arbitrarily chose the former) 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.

Well, that didn't work :-(

I ave used the latter version (i.e. the tip tree one) this time.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpVzOld5oW5r.pgp
Description: OpenPGP digital signature