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

[Ralf Baechle]

On Mon, Nov 07, 2011 at 11:04:03AM +1100, Stephen Rothwell wrote:

> Today's linux-next merge of the mips tree got a conflict in
> arch/mips/kernel/perf_event.c between commit e5dcb58aa510 ("MIPS: perf:
> Reorganize contents of perf support files") from Linus' tree and commit
> 6e8722f887b2 ("MIPS: irq: Remove IRQF_DISABLED") from the mips tree.
> 
> The former moved the code that the latter modified and it appeasr to have
> been fixed up in its new position.  So I just used the version of this
> file that is in Linus' tree.

Time to rebase, I think.  I hope Linus is going to make an -rc1 soon.

  Ralf
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/