* linux-next: manual merge of the powerpc tree with the arm tree
@ 2012-03-08 1:04 Stephen Rothwell
2012-03-08 2:33 ` Michael Neuling
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2012-03-08 1:04 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev
Cc: Russell King, linux-next, linux-kernel, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 884 bytes --]
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
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -133,7 -133,8 +133,8 @@@ config PP
select HAVE_REGS_AND_STACK_ACCESS_API
select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
select HAVE_GENERIC_HARDIRQS
- select HAVE_SPARSE_IRQ
+ select MAY_HAVE_SPARSE_IRQ
+ select SPARSE_IRQ
select IRQ_PER_CPU
select GENERIC_IRQ_SHOW
select GENERIC_IRQ_SHOW_LEVEL
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: manual merge of the powerpc tree with the arm tree
2012-03-08 1:04 linux-next: manual merge of the powerpc tree with the arm tree Stephen Rothwell
@ 2012-03-08 2:33 ` Michael Neuling
2012-03-08 3:51 ` Stephen Rothwell
0 siblings, 1 reply; 9+ messages in thread
From: Michael Neuling @ 2012-03-08 2:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-kernel, Rob Herring, linux-next, Paul Mackerras,
linuxppc-dev, Russell King
> 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
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@@ -133,7 -133,8 +133,8 @@@ config PP
> select HAVE_REGS_AND_STACK_ACCESS_API
> select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
> select HAVE_GENERIC_HARDIRQS
> - select HAVE_SPARSE_IRQ
> + select MAY_HAVE_SPARSE_IRQ
> + select SPARSE_IRQ
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: manual merge of the powerpc tree with the arm tree
2012-03-08 2:33 ` Michael Neuling
@ 2012-03-08 3:51 ` Stephen Rothwell
2012-03-08 5:52 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2012-03-08 3:51 UTC (permalink / raw)
To: Michael Neuling
Cc: linux-kernel, Rob Herring, linux-next, Paul Mackerras,
linuxppc-dev, Russell King
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the powerpc tree with the arm tree
2012-03-08 3:51 ` Stephen Rothwell
@ 2012-03-08 5:52 ` Benjamin Herrenschmidt
2012-03-08 23:35 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 9+ messages in thread
From: Benjamin Herrenschmidt @ 2012-03-08 5:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael Neuling, linux-kernel, Rob Herring, linux-next,
Paul Mackerras, linuxppc-dev, Russell King
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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the powerpc tree with the arm tree
2012-03-08 5:52 ` Benjamin Herrenschmidt
@ 2012-03-08 23:35 ` Benjamin Herrenschmidt
2012-03-09 0:39 ` Russell King
0 siblings, 1 reply; 9+ messages in thread
From: Benjamin Herrenschmidt @ 2012-03-08 23:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael Neuling, linux-kernel, Rob Herring, linux-next,
Paul Mackerras, linuxppc-dev, Russell King
On Thu, 2012-03-08 at 16:52 +1100, Benjamin Herrenschmidt wrote:
> 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.
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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the powerpc tree with the arm tree
2012-03-08 23:35 ` Benjamin Herrenschmidt
@ 2012-03-09 0:39 ` Russell King
2012-03-09 3:13 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 9+ messages in thread
From: Russell King @ 2012-03-09 0:39 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Stephen Rothwell, Michael Neuling, linux-kernel, Rob Herring,
linux-next, Paul Mackerras, linuxppc-dev
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:
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the powerpc tree with the arm tree
2012-03-09 0:39 ` Russell King
@ 2012-03-09 3:13 ` Benjamin Herrenschmidt
2012-03-09 16:51 ` Rob Herring
0 siblings, 1 reply; 9+ messages in thread
From: Benjamin Herrenschmidt @ 2012-03-09 3:13 UTC (permalink / raw)
To: Russell King
Cc: Stephen Rothwell, Michael Neuling, linux-kernel, Rob Herring,
linux-next, Paul Mackerras, linuxppc-dev
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:
> > 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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the powerpc tree with the arm tree
2012-03-09 3:13 ` Benjamin Herrenschmidt
@ 2012-03-09 16:51 ` Rob Herring
2012-03-12 1:12 ` Paul Mundt
0 siblings, 1 reply; 9+ messages in thread
From: Rob Herring @ 2012-03-09 16:51 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Stephen Rothwell, Michael Neuling, Paul Mundt, linux-sh,
linux-kernel, linux-next, Paul Mackerras, linuxppc-dev,
Russell King
On 03/08/2012 09:13 PM, Benjamin Herrenschmidt wrote:
> 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:
>>> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the powerpc tree with the arm tree
2012-03-09 16:51 ` Rob Herring
@ 2012-03-12 1:12 ` Paul Mundt
0 siblings, 0 replies; 9+ messages in thread
From: Paul Mundt @ 2012-03-12 1:12 UTC (permalink / raw)
To: Rob Herring
Cc: Stephen Rothwell, Michael Neuling, linux-sh, linux-kernel,
linux-next, Paul Mackerras, linuxppc-dev, Russell King
On Fri, Mar 09, 2012 at 10:51:27AM -0600, Rob Herring wrote:
> On 03/08/2012 09:13 PM, Benjamin Herrenschmidt wrote:
> > 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:
> >>> 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.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-03-12 1:45 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-08 1:04 linux-next: manual merge of the powerpc tree with the arm tree Stephen Rothwell
2012-03-08 2:33 ` Michael Neuling
2012-03-08 3:51 ` Stephen Rothwell
2012-03-08 5:52 ` Benjamin Herrenschmidt
2012-03-08 23:35 ` Benjamin Herrenschmidt
2012-03-09 0:39 ` Russell King
2012-03-09 3:13 ` Benjamin Herrenschmidt
2012-03-09 16:51 ` Rob Herring
2012-03-12 1:12 ` Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).