mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Luck, Tony" <tony.luck@intel.com>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build warnings after merge of the ia64 tree
Date: Fri, 17 Dec 2010 11:59:32 +1100	[thread overview]
Message-ID: <20101217115932.a633519e.sfr@canb.auug.org.au> (raw)
In-Reply-To: <987664A83D2D224EAE907B061CE93D530193D00A15@orsmsx505.amr.corp.intel.com>

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

Hi Tony,

On Thu, 16 Dec 2010 16:50:14 -0800 "Luck, Tony" <tony.luck@intel.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@intel.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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

  reply	other threads:[~2010-12-17  0:59 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-17  0:23 Stephen Rothwell
2010-12-17  0:43 ` Luck, Tony
2010-12-17  0:50 ` Luck, Tony
2010-12-17  0:59   ` Stephen Rothwell [this message]
2010-12-17 19:58     ` Luck, Tony
2014-07-16  2:00 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101217115932.a633519e.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®