On Thu, 19 Oct 2023 at 06:19, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.
>
Apologies, I should have updated or reverted the efi-fixes one but I
still need to find a way to deal with this issue on the fixes branch
too.
Note that the hunk below needs to be dropped or the build will fail.
--- a/drivers/firmware/efi/libstub/x86-stub.h
+++ b/drivers/firmware/efi/libstub/x86-stub.h
@@ -2,6 +2,8 @@
#include <linux/efi.h>
+extern struct boot_params *boot_params_pointer asm("boot_params");
+
extern void trampoline_32bit_src(void *, bool);
extern const u16 trampoline_ljmp_imm_offset;
