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

Stephen Rothwell sfr at
Thu Mar 8 14:51:31 EST 2012

Hi Mikey,

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

Stephen Rothwell                    sfr at
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <>

More information about the Linuxppc-dev mailing list