From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org,
Yoichi Yuasa <yoichi_yuasa@tripeaks•co.jp>,
Adrian Bunk <bunk@kernel•org>
Subject: linux-next: manual merge of the mips tree
Date: Tue, 15 Jul 2008 23:02:19 +1000 [thread overview]
Message-ID: <20080715230219.86638f63.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2008-07-15 13:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-15 13:02 Stephen Rothwell [this message]
2008-07-15 13:14 ` linux-next: manual merge of the mips tree Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080715230219.86638f63.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bunk@kernel$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
--cc=yoichi_yuasa@tripeaks$(echo .)co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox