From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Matt Fleming <matt.fleming@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Matthew Garrett <matthew.garrett@nebula.com>,
Linux-Next <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
linux-efi@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
"Luck, Tony" <tony.luck@intel.com>
Subject: Re: linux-next: Tree for Apr 26
Date: Mon, 29 Apr 2013 18:53:22 +1000 [thread overview]
Message-ID: <20130429185322.afaed9fd11269fba9bb09a54@canb.auug.org.au> (raw)
In-Reply-To: <517E2B21.8070009@intel.com>
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
On Mon, 29 Apr 2013 09:11:13 +0100 Matt Fleming <matt.fleming@intel.com> wrote:
>
> On 29/04/13 00:36, Stephen Rothwell wrote:
> > Commit e29c2de5f591 ("Merge tag 'v3.9-rc8' into efi-for-tip") by Matt
> > Fleming from the tip tree merged v3.9-rc8 (which has 0635eb8a54cf) with
> > the branch that contains 048517722cde but lost the "select UCS2_STRING"
> > which should be in drivers/firmware/efi/Kconfig.
>
> Eek, yes. Sorry about that. How should we resolve this?
You should probably add a commit that puts the line back in your tree and
get that merged into the tip tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-04-29 8:53 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-26 8:03 linux-next: Tree for Apr 26 Stephen Rothwell
2013-04-26 9:42 ` Sedat Dilek
2013-04-26 9:45 ` Sedat Dilek
2013-04-26 9:58 ` Michal Marek
2013-04-26 10:04 ` Michal Marek
2013-04-26 10:35 ` Sedat Dilek
2013-04-26 10:37 ` Sedat Dilek
2013-04-26 10:49 ` Sedat Dilek
2013-04-26 11:08 ` Michal Marek
2013-04-26 11:13 ` Michal Marek
2013-04-26 11:23 ` Sedat Dilek
2013-04-26 11:45 ` Sedat Dilek
2013-04-26 11:55 ` Michal Marek
2013-04-26 22:01 ` Yann E. MORIN
2013-04-27 6:54 ` Michal Marek
2013-04-27 11:30 ` Sedat Dilek
2013-04-27 15:24 ` Yann E. MORIN
2013-04-27 15:18 ` Yann E. MORIN
2013-04-26 12:06 ` Yann E. MORIN
2013-04-26 17:34 ` linux-next: Tree for Apr 26 (nfc) Randy Dunlap
2013-04-26 17:59 ` Marcel Holtmann
[not found] ` <20130426180357.7599d1b6b7965470905dcdf3-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2013-04-27 17:06 ` linux-next: Tree for Apr 26 Geert Uytterhoeven
[not found] ` <CAMuHMdWQ0rMuoH+peGMZ3=AdsYrMPpeV4_vSsLD3kaJukx=83w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-28 23:36 ` Stephen Rothwell
[not found] ` <20130429093628.b739ef3b879b6f8759bd31af-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2013-04-29 6:58 ` Geert Uytterhoeven
[not found] ` <CAMuHMdXZrjaSmttoGHqWCpTkUaxNm3zpWCeU8Lojnp3i=TjhZw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-29 7:08 ` Sedat Dilek
2013-04-29 8:11 ` Matt Fleming
2013-04-29 8:53 ` Stephen Rothwell [this message]
2013-04-29 13:50 ` Matt Fleming
2016-04-26 7:21 Stephen Rothwell
2017-04-26 8:03 Stephen Rothwell
2018-04-26 5:18 Stephen Rothwell
2019-04-26 9:40 Stephen Rothwell
2021-04-26 6:41 Stephen Rothwell
2022-04-26 9:54 Stephen Rothwell
2023-04-26 16:32 broonie
2024-04-26 7:18 Stephen Rothwell
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=20130429185322.afaed9fd11269fba9bb09a54@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=geert@linux-m68k.org \
--cc=hpa@zytor.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=matthew.garrett@nebula.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).