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

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] [day] [month] [year] [list]

Message-ID: <987664A83D2D224EAE907B061CE93D530193D00F91@orsmsx505.amr.corp.intel.com>
Date:	Fri, 17 Dec 2010 11:58:27 -0800
From:	"Luck, Tony" <tony.luck@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: linux-next: build warnings after merge of the ia64 tree

>> commit 3b38bb5f7f06356a89bb2cbf92ad346025e95192
>> Author: Huang Ying <ying.huang@...el.com>
>> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/