Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756918Ab3D2ILT (ORCPT ); Mon, 29 Apr 2013 04:11:19 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:34466 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751206Ab3D2ILR (ORCPT ); Mon, 29 Apr 2013 04:11:17 -0400 Message-ID: <517E2B21.8070009@intel.com> Date: Mon, 29 Apr 2013 09:11:13 +0100 From: Matt Fleming Organization: Intel Corporation (UK) Ltd. - Registered No. 1134945 - Pipers Way, Swindon SN3 1RJ User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: Stephen Rothwell CC: Geert Uytterhoeven , Matthew Garrett , Linux-Next , "linux-kernel@vger.kernel.org" , linux-efi@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , "Luck, Tony" Subject: Re: linux-next: Tree for Apr 26 References: <20130426180357.7599d1b6b7965470905dcdf3@canb.auug.org.au> <20130429093628.b739ef3b879b6f8759bd31af@canb.auug.org.au> In-Reply-To: <20130429093628.b739ef3b879b6f8759bd31af@canb.auug.org.au> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 616 Lines: 12 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? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/