RE: linux-next: build warnings after merge of the ia64 tree

From: Luck, Tony
Date: Fri Dec 17 2010 - 14:58:41 EST


>> 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.

Ah good. I've rebased a new version of my code on top of -rc6.

Thanks

-Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/