From: Matt Fleming <matt@console-pimps.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>, Tony Luck <tony.luck@intel.com>,
Matthew Garrett <matthew.garrett@nebula.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] EFI merge botch fix
Date: Tue, 30 Apr 2013 12:54:30 +0100 [thread overview]
Message-ID: <517FB0F6.9030103@console-pimps.org> (raw)
In-Reply-To: <20130430084731.GB21473@gmail.com>
On 30/04/13 09:47, Ingo Molnar wrote:
> The other problem is that tip:x86/efi also conflicts with current -git, as
> of v3.9 - due to interaction with an EFI fix tree ...
>
> This is getting ugly pretty fast, so I'd suggest to re-do the merges
> cleanly, not by rebasing the tree, but by redoing the first merge in
> essence:
>
> e29c2de5f591 Merge tag 'v3.9-rc8' into efi-for-tip
>
> By correctly merging v3.9-final into f53f292 - making sure the changes to
> drivers/firmware/efivars.c correctly merge over, and making sure the ia64
> select does not get lost.
>
> Something like this would do:
>
> git checkout -b x86-new-efi-branch f53f292
> git merge v3.9
> < ... resolve all the conflicts ...>
> git commit
>
> I can then (non-fast-forward) fetch this new EFI branch as the new
> tip:x86/efi.
OK, I re-did the merge against v3.9 as requested and published it as
'efi-for-tip2'. Would you like me to send a proper pull request if
that's easier to pull into the tip machinery?
I have also started accumulating fixes against the EFI changes in
tip/x86/efi. Would you like those as a separate pull request? The fixes
branch is 'efi-for-tip-fixes' and is based on the above merge branch,
'efi-for-tip2'. It mainly includes fixes for bugs in the pstore paths
which Seiji Aguchi found.
--
Matt Fleming, Intel Open Source Technology Center
next prev parent reply other threads:[~2013-04-30 11:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-29 18:18 [GIT PULL] EFI merge botch fix Matt Fleming
2013-04-30 8:47 ` Ingo Molnar
2013-04-30 11:54 ` Matt Fleming [this message]
2013-04-30 14:57 ` H. Peter Anvin
-- strict thread matches above, loose matches on Subject: below --
2013-04-30 15:25 Matt Fleming
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=517FB0F6.9030103@console-pimps.org \
--to=matt@console-pimps.org \
--cc=hpa@zytor.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.garrett@nebula.com \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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