linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Jones <davej@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the pci-current tree
Date: Wed, 4 Jan 2012 19:27:30 -0500	[thread overview]
Message-ID: <20120105002729.GA27916@redhat.com> (raw)
In-Reply-To: <20120105111940.e5675c8d16715767ed193461@canb.auug.org.au>

On Thu, Jan 05, 2012 at 11:19:40AM +1100, Stephen Rothwell wrote:
 > Hi Jesse,
 > 
 > On Wed, 4 Jan 2012 16:11:22 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
 > >
 > > Arg failure of my hand merge.
 > 
 > Not really, the original was broken (as is the version in fc16 (which has
 > been disabled there)).

ugh, sorry about that. too many trees.

the one I build-tested had it right, but I generated an incremental
from a wrong one..

	Dave

  reply	other threads:[~2012-01-05  0:27 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-05  0:07 linux-next: build failure after merge of the pci-current tree Stephen Rothwell
2012-01-05  0:11 ` Jesse Barnes
2012-01-05  0:19   ` Stephen Rothwell
2012-01-05  0:27     ` Dave Jones [this message]
2012-01-05  2:16 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2011-11-03  1:53 Stephen Rothwell
2011-11-03  2:04 ` Jesse Barnes
2011-11-03  2:37   ` Stephen Rothwell
2011-11-03  3:22 ` Stephen Rothwell
2011-11-03  3:32 ` Stephen Rothwell
2011-11-03  5:19   ` Stephen Rothwell
2011-11-03 15:02     ` Jesse Barnes
2011-08-02  0:48 Stephen Rothwell
2011-08-02  1:23 ` Stephen Rothwell
2011-08-02 15:53   ` Jesse Barnes
2011-07-07  0:58 Stephen Rothwell
2011-07-07 15:52 ` Jesse Barnes
2011-07-07 18:19   ` Ram Pai
2011-07-08 22:49     ` Jesse Barnes

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=20120105002729.GA27916@redhat.com \
    --to=davej@redhat.com \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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;
as well as URLs for NNTP newsgroup(s).