linux-kernel - Re: linux-next: manual merge of the irqflags tree with Linus' tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <26564.1286457097@redhat.com>
Date:	Thu, 07 Oct 2010 14:11:37 +0100
From:	David Howells <dhowells@...hat.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	dhowells@...hat.com, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Ralf Baechle <ralf@...ux-mips.org>
Subject: Re: linux-next: manual merge of the irqflags tree with Linus' tree

Stephen Rothwell <sfr@...b.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
--
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/