Re: linux-next: manual merge of the powerpc tree with the arm tree

From: Stephen Rothwell
Date: Wed Mar 07 2012 - 22:51:52 EST


Hi Mikey,

On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling <mikey@xxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature