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,
Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>,
Christoph Egger <siccegge@cs.fau.de>,
Josh Boyer <jwboyer@linux.vnet.ibm.com>
Subject: linux-next: manual merge of the mtd tree with Linus' tree
Date: Sat, 7 Aug 2010 13:37:40 +1000 [thread overview]
Message-ID: <20100807133740.a3549810.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
Hi David,
Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/Kconfig and drivers/mtd/maps/redwood.c between commit
c76986cca8379db619de4b6c6b7359125df0e341 ("Remove REDWOOD_[456] config
options and conditional code") from Linus' tree and commit
73ee5760253dc8893502e19a9cb118d25dab21ec ("mtd: remove redwood map
driver") from the mtd tree.
The latter just went further by actually removing the driver so I used
that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-08-07 3:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-07 3:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-17 4:49 linux-next: manual merge of the mtd tree with Linus' tree Stephen Rothwell
2021-08-17 8:15 ` Sean Young
2021-08-17 8:41 ` Miquel Raynal
2019-01-29 0:17 Stephen Rothwell
2019-01-29 14:12 ` Boris Brezillon
2011-05-27 4:00 Stephen Rothwell
2011-05-27 7:47 ` Artem Bityutskiy
2011-05-27 4:00 Stephen Rothwell
2011-05-27 7:43 ` Artem Bityutskiy
2010-10-26 0:32 Stephen Rothwell
2010-04-29 2:58 Stephen Rothwell
2009-06-01 4:00 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=20100807133740.a3549810.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dwmw2@infradead.org \
--cc=jwboyer@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=qy03fugy@stud.informatik.uni-erlangen.de \
--cc=siccegge@cs.fau.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).