| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20101007150835.9e1a49f7.sfr@canb.auug.org.au>
Date: Thu, 7 Oct 2010 15:08:35 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Howells <dhowells@...hat.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Ralf Baechle <ralf@...ux-mips.org>,
David Howells <dhowells@...hat.com>
Subject: linux-next: manual merge of the irqflags tree with Linus' tree
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@...b.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>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists