linux-kernel - Re: linux-next: manual merge of the tip tree with the efi-fixes 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20231019151927.2a20d800@canb.auug.org.au>
Date:   Thu, 19 Oct 2023 15:19:27 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Ard Biesheuvel <ardb@...nel.org>
Cc:     Ingo Molnar <mingo@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the efi-fixes
 tree

Hi all,

On Thu, 19 Oct 2023 14:54:04 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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

Content of type "application/pgp-signature" skipped