* linux-next: manual merge of the irqflags tree with Linus' tree
@ 2010-10-07 4:08 Stephen Rothwell
2010-10-07 13:11 ` David Howells
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-10-07 4:08 UTC (permalink / raw)
Cc: linux-next, linux-kernel, Ralf Baechle, David Howells
Hi David,
Today's linux-next merge of the irqflags tree got a conflict in
arch/mips/kernel/irq-gic.c between commit
863cb9bad8f992a9c171e90552045eac77808e84 ("MIPS: GIC: Remove dependencies
from Malta files") from Linus' tree and commit
9cbb8e371af264699522030ec637c55a58765859 ("MIPS: Add missing #inclusions
of <linux/irq.h>") from the irqflags tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/mips/kernel/irq-gic.c
index 82ba9f6,e0ff05d..0000000
--- a/arch/mips/kernel/irq-gic.c
+++ b/arch/mips/kernel/irq-gic.c
@@@ -7,7 -8,7 +8,6 @@@
#include <asm/io.h>
#include <asm/gic.h>
#include <asm/gcmpregs.h>
- #include <asm/irq.h>
-#include <asm/mips-boards/maltaint.h>
#include <linux/hardirq.h>
#include <asm-generic/bitops/find.h>
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the irqflags tree with Linus' tree
2010-10-07 4:08 linux-next: manual merge of the irqflags tree with Linus' tree Stephen Rothwell
@ 2010-10-07 13:11 ` David Howells
0 siblings, 0 replies; 2+ messages in thread
From: David Howells @ 2010-10-07 13:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: dhowells, linux-next, linux-kernel, Ralf Baechle
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the irqflags tree got a conflict in
> arch/mips/kernel/irq-gic.c between commit
> 863cb9bad8f992a9c171e90552045eac77808e84 ("MIPS: GIC: Remove dependencies
> from Malta files") from Linus' tree and commit
> 9cbb8e371af264699522030ec637c55a58765859 ("MIPS: Add missing #inclusions
> of <linux/irq.h>") from the irqflags tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Fixed in the irqflags tree.
David
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-07 13:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-07 4:08 linux-next: manual merge of the irqflags tree with Linus' tree Stephen Rothwell
2010-10-07 13:11 ` David Howells
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).