* linux-next: manual merge of the mips tree
@ 2008-07-15 13:02 Stephen Rothwell
2008-07-15 13:14 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-07-15 13:02 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-next, Yoichi Yuasa, Adrian Bunk
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the mips tree
2008-07-15 13:02 linux-next: manual merge of the mips tree Stephen Rothwell
@ 2008-07-15 13:14 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2008-07-15 13:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Yoichi Yuasa, Adrian Bunk
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-07-15 13:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-15 13:02 linux-next: manual merge of the mips tree Stephen Rothwell
2008-07-15 13:14 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).