[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120308145131.fad50bbc79c36f0b0b12d101@canb.auug.org.au>
Date: Thu, 8 Mar 2012 14:51:31 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Michael Neuling <mikey@...ling.org>
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
linuxppc-dev@...ts.ozlabs.org, Russell King <rmk@....linux.org.uk>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Rob Herring <rob.herring@...xeda.com>
Subject: Re: linux-next: manual merge of the powerpc tree with the arm tree
Hi Mikey,
On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling <mikey@...ling.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.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists