From: Arnd Bergmann <arnd@arndb.de>
To: Jason Cooper <jason@lakedaemon.net>
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 17:32:12 +0000 [thread overview]
Message-ID: <201203151732.12852.arnd@arndb.de> (raw)
In-Reply-To: <20120315172213.GC20243@titan.lakedaemon.net>
On Thursday 15 March 2012, Jason Cooper wrote:
> 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.
Ok. I hope we can still make it for v3.4, but I think it won't be
much of a problem if not -- it will get merged into linux-next
just after v3.4-rc1 in case we don't make it, and then you have
plenty of time to improve it further.
> 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?
You should base it on depends/irqdomain.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: build failure after merge of the final tree (arm-soc tree related)
Date: Thu, 15 Mar 2012 17:32:12 +0000 [thread overview]
Message-ID: <201203151732.12852.arnd@arndb.de> (raw)
In-Reply-To: <20120315172213.GC20243@titan.lakedaemon.net>
On Thursday 15 March 2012, Jason Cooper wrote:
> 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.
Ok. I hope we can still make it for v3.4, but I think it won't be
much of a problem if not -- it will get merged into linux-next
just after v3.4-rc1 in case we don't make it, and then you have
plenty of time to improve it further.
> 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?
You should base it on depends/irqdomain.
Arnd
next prev parent reply other threads:[~2012-03-15 17:32 UTC|newest]
Thread overview: 32+ 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-14 23:59 ` Stephen Rothwell
2012-03-14 23:59 ` Stephen Rothwell
2012-03-15 0:20 ` Jason Cooper
2012-03-15 0:20 ` Jason Cooper
2012-03-15 2:08 ` Stephen Rothwell
2012-03-15 2:08 ` Stephen Rothwell
2012-03-15 16:39 ` Arnd Bergmann
2012-03-15 16:39 ` Arnd Bergmann
2012-03-15 17:22 ` Jason Cooper
2012-03-15 17:22 ` Jason Cooper
2012-03-15 17:32 ` Arnd Bergmann [this message]
2012-03-15 17:32 ` Arnd Bergmann
2012-03-15 1:53 ` Paul Gortmaker
2012-03-15 1:53 ` Paul Gortmaker
2012-03-15 2:05 ` Stephen Rothwell
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 11:26 ` Stephen Rothwell
2012-09-17 11:26 ` Stephen Rothwell
2012-09-17 14:11 ` Olof Johansson
2012-09-17 14:11 ` Olof Johansson
2012-09-17 17:23 ` Tony Lindgren
2012-09-17 17:23 ` Tony Lindgren
2012-09-17 14:29 ` Arnd Bergmann
2012-09-17 14:29 ` Arnd Bergmann
2012-09-17 17:22 ` Tony Lindgren
2012-09-17 17:22 ` Tony Lindgren
2012-09-17 20:32 ` 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=201203151732.12852.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michael@walle.cc \
--cc=olof@lixom.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.