public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Jason Cooper <jason@lakedaemon•net>
To: Arnd Bergmann <arnd@arndb•de>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
	Olof Johansson <olof@lixom•net>,
	linux-arm-kernel@lists•infradead.org,
	Michael Walle <michael@walle•cc>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: build failure after merge of the final tree (arm-soc tree related)
Date: Thu, 15 Mar 2012 13:22:13 -0400	[thread overview]
Message-ID: <20120315172213.GC20243@titan.lakedaemon.net> (raw)
In-Reply-To: <201203151639.38223.arnd@arndb.de>

On Thu, Mar 15, 2012 at 04:39:38PM +0000, Arnd Bergmann wrote:
> On Thursday 15 March 2012, Jason Cooper wrote:
> > That's my mistake.  I did a pull request for the wrong branch.  Olof,
> > could you please drop the offending branch and I'll submit a new pull
> > request once I have a chance to test Arnd's irq patch?
> 
> I reverted this in the for-next branch for now. The two initial patches
> from the kirkwood/board branch are still present.

Okay, thanks.  I've rebased onto next/boards and merged the
depends/irqdomain branch.  I'm making progress, but not finished yet.

How is a pull-request done in the above scenario?  is my merge commit
included in the series?  what is the pull-request based on?
next/boards, or depends/irqdomain?

thx,

Jason.

  reply	other threads:[~2012-03-15 17:22 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-14 23:59 linux-next: build failure after merge of the final tree (arm-soc tree related) Stephen Rothwell
2012-03-15  0:20 ` Jason Cooper
2012-03-15  2:08   ` Stephen Rothwell
2012-03-15 16:39   ` Arnd Bergmann
2012-03-15 17:22     ` Jason Cooper [this message]
2012-03-15 17:32       ` Arnd Bergmann
2012-03-15  1:53 ` Paul Gortmaker
2012-03-15  2:05   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2012-09-17 11:26 Stephen Rothwell
2012-09-17 14:11 ` Olof Johansson
2012-09-17 17:23   ` Tony Lindgren
2012-09-17 14:29 ` Arnd Bergmann
2012-09-17 17:22   ` Tony Lindgren
2012-09-17 20:32     ` Tony Lindgren
2011-07-22  6:42 Stephen Rothwell
2011-07-23 12:36 ` Arnd Bergmann

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=20120315172213.GC20243@titan.lakedaemon.net \
    --to=jason@lakedaemon$(echo .)net \
    --cc=arnd@arndb$(echo .)de \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=michael@walle$(echo .)cc \
    --cc=olof@lixom$(echo .)net \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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