From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Tue, 06 Dec 2011 22:52:15 +0100 Subject: [U-Boot] [STATUS] Getting ready for -rc1 In-Reply-To: References: <20111206111222.D9B7E1F9E48@gemini.denx.de> <4EDE003B.6010609@gmail.com> <4EDE8908.3070206@aribaud.net> Message-ID: <4EDE8E8F.5060200@aribaud.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Le 06/12/2011 22:33, Graeme Russ a ?crit : > Hi Albert, > > On Wed, Dec 7, 2011 at 8:28 AM, Albert ARIBAUD > wrote: >> Hi Graeme, >> >> Le 06/12/2011 12:44, Graeme Russ a ?crit : >> >>> Hi Wolfgang, >>> >>> On 06/12/11 22:12, Wolfgang Denk wrote: >>>> >>>> Hi all, >>>> >>>> first I would like to thank everybody who helped me to reduce the >>>> backlog of patches and pushed stuff through the u-boot-staging repo: >>>> thanks: Anatolij, Heiko, Marek, Stefan, and Stefano. >>>> >>>> Hm... nobody outside DENX in this list :-( >>> >>> >>> I would have liked to have helped, but I've been flat out at home and >>> barely able to get x86 ready for -rc1. I am glad to see that it looks like >>> a workable solution :) >>> >>>> Second, I would like to get ready for the -rc1 pre-release. >>>> I'll wait for the next ARM pull request from Albert, and then I will >>>> push -rc1 out. >>>> >>>> If anybody has any unmerged patches pending that are supposed to go >>>> in, please speak up now. >>> >>> >>> There is http://patchwork.ozlabs.org/patch/128356/ but apparently there is >>> another fix for this in the ARM tree somewhere - Albert, can you please >>> confirm? If so, x86 is ready to roll >> >> >> Confirm: patch from Sanjeev Premi, dated 2011-11-16, "part_efi: fix compile >> errors", currently in u-boot-arm/master. Once I pull in whatever I can >> tonight, I'll send the pull request to Wolfgang and the patch will be there. > > Eep, this collides with commit > 4715a81136049167160230efd28eb9d48eeded1f in u-boot/master. The one in > u-boot-arm/master is a superset of the one in u-boot/master Then when I rebase the ARM tree onto the mailine one, a merge conflict should arise and I will then merge the commits together as part of the rebase. That OK? > Regards, > > Graeme Amicalement, -- Albert.