lkml.org 
[lkml]   [2010]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the irqflags tree with Linus' tree
Date
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


\
 
 \ /
  Last update: 2010-10-07 15:13    [W:0.137 / U:0.984 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site