On Mon, 29 Apr 2013 09:11:13 +0100 Matt Fleming <matt.flem...@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 s...@canb.auug.org.au
Description: PGP signature