Messages in this thread | | | From | David Howells <> | Subject | Re: linux-next: manual merge of the irqflags tree with Linus' tree | Date | Thu, 07 Oct 2010 14:11:37 +0100 |
| |
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
| |