linux-kernel - Re: linux-next: Tree for Apr 26

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130429185322.afaed9fd11269fba9bb09a54@canb.auug.org.au>
Date:	Mon, 29 Apr 2013 18:53:22 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Matt Fleming <matt.fleming@...el.com>
Cc:	Geert Uytterhoeven <geert@...ux-m68k.org>,
	Matthew Garrett <matthew.garrett@...ula.com>,
	Linux-Next <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	linux-efi@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	"Luck, Tony" <tony.luck@...el.com>
Subject: Re: linux-next: Tree for Apr 26

On Mon, 29 Apr 2013 09:11:13 +0100 Matt Fleming <matt.fleming@...el.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped