From: Stephen Rothwell <hidden> Date: 2012-03-08 01:04:38
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/Kconfig between commit 2ed86b16eabe ("irq: make SPARSE_IRQ
an optionally hidden option") from the arm tree and commit ad5b7f1350c2
("powerpc: Make SPARSE_IRQ required") from the powerpc tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/powerpc/Kconfig
index bf7dbc2,4eecaaa..0000000
From: Michael Neuling <hidden> Date: 2012-03-08 02:34:01
quoted hunk
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/Kconfig between commit 2ed86b16eabe ("irq: make SPARSE_IRQ
an optionally hidden option") from the arm tree and commit ad5b7f1350c2
("powerpc: Make SPARSE_IRQ required") from the powerpc tree.
I fixed it up (see below) and can carry the fix as necessary.
--=20
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/powerpc/Kconfig
index bf7dbc2,4eecaaa..0000000
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.
Mikey
From: Stephen Rothwell <hidden> Date: 2012-03-08 03:51:55
Hi Mikey,
On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling [off-list ref] 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@canb.auug.org.au
From: Benjamin Herrenschmidt <benh@kernel.crashing.org> Date: 2012-03-08 05:53:11
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 [off-list ref] wrote:
quoted
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.
From: Benjamin Herrenschmidt <benh@kernel.crashing.org> Date: 2012-03-08 23:36:16
On Thu, 2012-03-08 at 16:52 +1100, Benjamin Herrenschmidt wrote:
On Thu, 2012-03-08 at 14:51 +1100, Stephen Rothwell wrote:
quoted
Hi Mikey,
On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling [off-list ref] wrote:
quoted
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.
Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If
I remove it, then I get Kconfig warnings:
warning: (PPC) selects SPARSE_IRQ which has unmet direct dependencies (HAVE_GENERIC_HARDIRQS && HAVE_SPARSE_IRQ)
Cheers,
Ben.
From: Russell King <hidden> Date: 2012-03-09 00:40:29
On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote:
Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If
I remove it, then I get Kconfig warnings:
warning: (PPC) selects SPARSE_IRQ which has unmet direct dependencies
(HAVE_GENERIC_HARDIRQS && HAVE_SPARSE_IRQ)
Do you have commit 2ed86b16eabe4efbf80cc725a8cbb5310746a2fc ?
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
From: Benjamin Herrenschmidt <benh@kernel.crashing.org> Date: 2012-03-09 03:14:11
On Fri, 2012-03-09 at 00:39 +0000, Russell King wrote:
On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote:
quoted
Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If
I remove it, then I get Kconfig warnings:
warning: (PPC) selects SPARSE_IRQ which has unmet direct dependencies
(HAVE_GENERIC_HARDIRQS && HAVE_SPARSE_IRQ)
Do you have commit 2ed86b16eabe4efbf80cc725a8cbb5310746a2fc ?
Nope, Grant patch didn't mention a dependency.
Cheers,
Ben.
From: Rob Herring <hidden> Date: 2012-03-09 17:01:35
On 03/08/2012 09:13 PM, Benjamin Herrenschmidt wrote:
On Fri, 2012-03-09 at 00:39 +0000, Russell King wrote:
quoted
On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote:
quoted
Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If
I remove it, then I get Kconfig warnings:
warning: (PPC) selects SPARSE_IRQ which has unmet direct dependencies
(HAVE_GENERIC_HARDIRQS && HAVE_SPARSE_IRQ)
Do you have commit 2ed86b16eabe4efbf80cc725a8cbb5310746a2fc ?
Nope, Grant patch didn't mention a dependency.
My opinion is that SPARSE_IRQ shouldn't be user visible option, and the
simple solution was to just make it hidden. It wasn't clear if this was
desired or not for other arches at the time. There is a mixture of
settings in powerpc defconfigs. SuperH selects it for 32-bit and leaves
it user selectable for 64-bit.
I'm happy to revert adding MAY_HAVE_SPARSE_IRQ and just make SPARSE_IRQ
a hidden option. It really just needs the okay from SuperH folks.
Rob
From: Paul Mundt <hidden> Date: 2012-03-12 01:13:50
On Fri, Mar 09, 2012 at 10:51:27AM -0600, Rob Herring wrote:
On 03/08/2012 09:13 PM, Benjamin Herrenschmidt wrote:
quoted
On Fri, 2012-03-09 at 00:39 +0000, Russell King wrote:
quoted
On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote:
quoted
Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If
I remove it, then I get Kconfig warnings:
warning: (PPC) selects SPARSE_IRQ which has unmet direct dependencies
(HAVE_GENERIC_HARDIRQS && HAVE_SPARSE_IRQ)
Do you have commit 2ed86b16eabe4efbf80cc725a8cbb5310746a2fc ?
Nope, Grant patch didn't mention a dependency.
My opinion is that SPARSE_IRQ shouldn't be user visible option, and the
simple solution was to just make it hidden. It wasn't clear if this was
desired or not for other arches at the time. There is a mixture of
settings in powerpc defconfigs. SuperH selects it for 32-bit and leaves
it user selectable for 64-bit.
I'm happy to revert adding MAY_HAVE_SPARSE_IRQ and just make SPARSE_IRQ
a hidden option. It really just needs the okay from SuperH folks.
We basically want it always-enabled for 32-bit and it doesn't matter much
about 64-bit. In the future I'll probably fix up the 64-bit stuff to use
it too and then we'll just leave it on all the time, but it's not such a
big deal if it's not visible for enabling on 64-bit at the moment given
that it's probably broken there at the moment.