From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Woodhouse <dwmw2@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Ralf Baechle" <ralf@linux-mips•org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>,
"Artem Bityutskiy" <Artem.Bityutskiy@nokia•com>
Subject: linux-next: manual merge of the mtd tree with the tree
Date: Thu, 3 Dec 2009 12:15:33 +1100 [thread overview]
Message-ID: <20091203121533.f9de2dac.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
Hi David,
Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/nand/excite_nandflash.c between commit
9e910a91b88d450951c849d12598645562acc4b2 ("MIPS: eXcite: Remove
platform") from the mips tree and commit
8fead79c96c68164372c47c7b3c79d2da0871c93 ("mtd: move excite_nand_remove
to .devexit.text") from the mtd tree.
The former just removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-12-03 1:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-03 1:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-03-01 3:52 linux-next: manual merge of the mtd tree with the tree Stephen Rothwell
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=20091203121533.f9de2dac.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Artem.Bityutskiy@nokia$(echo .)com \
--cc=dwmw2@infradead$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/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