From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Ard Biesheuvel <ardb@kernel•org>
Cc: Ingo Molnar <mingo@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the efi-fixes tree
Date: Thu, 19 Oct 2023 15:19:27 +1100 [thread overview]
Message-ID: <20231019151927.2a20d800@canb.auug.org.au> (raw)
In-Reply-To: <20231019145404.63bd38ca@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1010 bytes --]
Hi all,
On Thu, 19 Oct 2023 14:54:04 +1100 Stephen Rothwell <sfr@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-10-19 4:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 3:54 linux-next: manual merge of the tip tree with the efi-fixes tree Stephen Rothwell
2023-10-19 4:19 ` Stephen Rothwell [this message]
2023-10-19 7:01 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231019151927.2a20d800@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ardb@kernel$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox