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

Message-Id: <20101217115932.a633519e.sfr@canb.auug.org.au>
Date:	Fri, 17 Dec 2010 11:59:32 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Luck, Tony" <tony.luck@...el.com>
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

Hi Tony,

On Thu, 16 Dec 2010 16:50:14 -0800 "Luck, Tony" <tony.luck@...el.com> 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@...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.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped