Subject: Re: linux-next: manual merge of the mips tree

From: Ralf Baechle <[email-masked]>
Date: Tue, 15 Jul 2008 14:14:56 +0100

On Tue, Jul 15, 2008 at 11:02:19PM +1000, Stephen Rothwell wrote:

> Hi Ralf,
> 
> Today's linux-next merge of the mips tree got a trivial conflict in
> drivers/mtd/maps/mtx-1_flash.c between commit
> 59018b6d2acabb114ab58637e6ab95ba424a89d0 ("MTD/JFFS2: remove CVS
> keywords") from the mtd tree and commit
> 16a21f086d79f09e3f4318b4989f854266bb41a8 ("[MIPS] MTX-1 flash partition
> setup move to platform devices registration") from the mips tree.
> 
> The former removed the CVS keywords from a file that the latter deleted.
> 
> I just removed the file.

That's fine.  I'm planning to send my grand pull request for 2.6.27 to
Linus tonight so your tomorrow's MIPS pull will be empty.

Cheers,

  Ralf