From: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Ralf Baechle <ralf@linux-mips•org>,
David Howells <dhowells@redhat•com>
Subject: linux-next: manual merge of the irqflags tree with Linus' tree
Date: Thu, 7 Oct 2010 15:08:35 +1100 [thread overview]
Message-ID: <20101007150835.9e1a49f7.sfr@canb.auug.org.au> (raw)
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>
next reply other threads:[~2010-10-07 4:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-07 4:08 Stephen Rothwell [this message]
2010-10-07 13:11 ` linux-next: manual merge of the irqflags tree with Linus' tree David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101007150835.9e1a49f7.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox