Hi Tony, On Thu, 16 Dec 2010 16:50:14 -0800 "Luck, Tony" <tony.luck@xxxxxxxxx> wrote: > > > Hmmmh. I wonder why I didn't see them in my build? > > Ah - because I only built against Linus' tree, and linux-next > has: > > commit 3b38bb5f7f06356a89bb2cbf92ad346025e95192 > Author: Huang Ying <ying.huang@xxxxxxxxx> > Date: Thu Dec 2 10:40:53 2010 +0800 > > ACPI, APEI, use raw spinlock in ERST That commit is in Linus' tree as of v2.6.37-rc6 so if you merge -rc6 into your tree, you can fix the conflict there. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpkhIeEzqoGE.pgp
Description: PGP signature
