linux-efi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
To: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Cc: Geert Uytterhoeven
	<geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>,
	Matthew Garrett
	<matthew.garrett-05XSO3Yj/JvQT0dZR+AlfA@public.gmane.org>,
	Linux-Next <linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	"linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
	<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>,
	Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>,
	"H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>,
	Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>,
	"Luck, Tony" <tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: Re: linux-next: Tree for Apr 26
Date: Mon, 29 Apr 2013 09:11:13 +0100	[thread overview]
Message-ID: <517E2B21.8070009@intel.com> (raw)
In-Reply-To: <20130429093628.b739ef3b879b6f8759bd31af-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>

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?

  parent reply	other threads:[~2013-04-29  8:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20130426180357.7599d1b6b7965470905dcdf3@canb.auug.org.au>
     [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 [this message]
2013-04-29  8:53             ` Stephen Rothwell
2013-04-29 13:50               ` 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=517E2B21.8070009@intel.com \
    --to=matt.fleming-ral2jqcrhueavxtiumwx3w@public.gmane.org \
    --cc=geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org \
    --cc=hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org \
    --cc=linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=matthew.garrett-05XSO3Yj/JvQT0dZR+AlfA@public.gmane.org \
    --cc=mingo-X9Un+BFzKDI@public.gmane.org \
    --cc=peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org \
    --cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org \
    --cc=tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org \
    --cc=tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
    /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).