From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michael Neuling <mikey@neuling.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org,
Russell King <rmk@arm.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>
Subject: Re: linux-next: manual merge of the powerpc tree with the arm tree
Date: Thu, 08 Mar 2012 16:52:31 +1100 [thread overview]
Message-ID: <1331185951.3105.29.camel@pasglop> (raw)
In-Reply-To: <20120308145131.fad50bbc79c36f0b0b12d101@canb.auug.org.au>
On Thu, 2012-03-08 at 14:51 +1100, Stephen Rothwell wrote:
> Hi Mikey,
>
> On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling <mikey@neuling.org> wrote:
> >
> > Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
> >
> > In fact, keeping MAY_HAVE_SPARSE_IRQ seems to make SPARSE_IRQ user
> > selectable, which we don't want anymore since ad5b7f1350c2.
>
> Yes, indeed. I will fix up the merge resolution for tomorrow.
This is my fault. Grant's patch had a collision and I manually fixed it
up. While doing that, I put back MAY_HAVE_SPARSE_IRQ which the patch
originally took out.
Cheers,
Ben.
WARNING: multiple messages have this Message-ID (diff)
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michael Neuling <mikey@neuling.org>,
linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>,
linux-next@vger.kernel.org, Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the powerpc tree with the arm tree
Date: Thu, 08 Mar 2012 16:52:31 +1100 [thread overview]
Message-ID: <1331185951.3105.29.camel@pasglop> (raw)
In-Reply-To: <20120308145131.fad50bbc79c36f0b0b12d101@canb.auug.org.au>
On Thu, 2012-03-08 at 14:51 +1100, Stephen Rothwell wrote:
> Hi Mikey,
>
> On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling <mikey@neuling.org> wrote:
> >
> > Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
> >
> > In fact, keeping MAY_HAVE_SPARSE_IRQ seems to make SPARSE_IRQ user
> > selectable, which we don't want anymore since ad5b7f1350c2.
>
> Yes, indeed. I will fix up the merge resolution for tomorrow.
This is my fault. Grant's patch had a collision and I manually fixed it
up. While doing that, I put back MAY_HAVE_SPARSE_IRQ which the patch
originally took out.
Cheers,
Ben.
next prev parent reply other threads:[~2012-03-08 5:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 1:04 linux-next: manual merge of the powerpc tree with the arm tree Stephen Rothwell
2012-03-08 1:04 ` Stephen Rothwell
2012-03-08 1:04 ` Stephen Rothwell
2012-03-08 2:33 ` Michael Neuling
2012-03-08 2:33 ` Michael Neuling
2012-03-08 3:51 ` Stephen Rothwell
2012-03-08 3:51 ` Stephen Rothwell
2012-03-08 5:52 ` Benjamin Herrenschmidt [this message]
2012-03-08 5:52 ` Benjamin Herrenschmidt
2012-03-08 23:35 ` Benjamin Herrenschmidt
2012-03-08 23:35 ` Benjamin Herrenschmidt
2012-03-09 0:39 ` Russell King
2012-03-09 0:39 ` Russell King
2012-03-09 3:13 ` Benjamin Herrenschmidt
2012-03-09 3:13 ` Benjamin Herrenschmidt
2012-03-09 16:51 ` Rob Herring
2012-03-09 16:51 ` Rob Herring
2012-03-09 16:51 ` Rob Herring
2012-03-12 1:12 ` Paul Mundt
2012-03-12 1:12 ` Paul Mundt
2012-03-12 1:12 ` Paul Mundt
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=1331185951.3105.29.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
--cc=paulus@samba.org \
--cc=rmk@arm.linux.org.uk \
--cc=rob.herring@calxeda.com \
--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.