From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
linux-kernel@vger.kernel.org,
Artem Bityutskiy <dedekind1@gmail.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree
Date: Mon, 19 Mar 2012 10:00:27 +0100 [thread overview]
Message-ID: <4F66F5AB.7020600@atmel.com> (raw)
In-Reply-To: <20120319174743.aff001d4f84e82cf4042277a@canb.auug.org.au>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 03/19/2012 07:47 AM, Stephen Rothwell :
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mtd/nand/atmel_nand.c between commit 4331c79c6895 ("mtd: do
> not use plain 0 as NULL") from the l2-mtd tree and commit
> d6a016616ba8 ("atmel/nand: add DT support") from the arm-soc tree.
>
> The latter superceded the former, so I used that.
That is definitively the proper fix. Thanks Stephen.
Best regards,
- --
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJPZvWlAAoJEAf03oE53VmQd0EIAKV1xC3F+fd6lvu3rKNyzUl0
yfcvNtc9cFbwuR9A3cbeoCo6FbfdSpsT2eT8v+DZ5LDvPmJ9ln9jgqyldq+QfblU
2KpyOWSLeLpG6ILky7Hlo4tjm1NA3GNZGLpyQ2Yln5r17zeTHqaCBeL+xHXOdgcM
Uvrrix67AmnL91nF4QNPdOfKYnv2h+J2OWW6ukFBajQOMBIiVeddVL62qKYOvq0K
QrgTa5D4cygvD0NUMTrrJ5GXjR+afAL7K5pk0Aab9C6pzgKGVredD5qSu/Zpbn8n
+aHXNyfqLQ9+7++a+hm6VNMTrMZxFo/MZoQZsigu7JkJ8lDTNhsaWkm3QqWl4c4=
=6Y0V
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2012-03-19 9:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 6:47 linux-next: manual merge of the arm-soc tree with the l2-mtd tree Stephen Rothwell
2012-03-19 9:00 ` Nicolas Ferre [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-05-14 8:47 Stephen Rothwell
2012-09-24 9:39 Stephen Rothwell
2012-09-24 15:50 ` Jason Cooper
2012-09-25 6:50 Stephen Rothwell
2012-11-26 10:16 Stephen Rothwell
2012-11-27 4:37 Stephen Rothwell
2013-07-02 5:29 Stephen Rothwell
2013-07-02 5:44 ` Gupta, Pekon
2013-07-02 6:00 ` Olof Johansson
2013-07-02 6:18 ` Gupta, Pekon
2013-07-02 7:33 ` Artem Bityutskiy
2013-07-02 7:30 ` Artem Bityutskiy
2013-07-02 5:33 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=4F66F5AB.7020600@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=arnd@arndb.de \
--cc=dedekind1@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=plagnioj@jcrosoft.com \
--cc=sfr@canb.auug.org.au \
/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