From: Artem Bityutskiy <dedekind1@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Brian Norris <computersforpeace@gmail.com>,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the mtd tree
Date: Fri, 15 Mar 2013 10:32:57 +0200 [thread overview]
Message-ID: <1363336377.11441.115.camel@sauron.fi.intel.com> (raw)
In-Reply-To: <20130315115825.6c2b7ad9c48c82640ff9f3b8@canb.auug.org.au>
On Fri, 2013-03-15 at 11:58 +1100, Stephen Rothwell wrote:
> Hi Artem,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> include/linux/mtd/nand.h between commit 5bc7c33ca93a ("mtd: nand:
> reintroduce NAND_NO_READRDY as NAND_NEED_READRDY") from the mtd tree and
> commit edac3311879c ("mtd: nand: remove AG-AND support") from the l2-mtd
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks Stephen, please, carry this one so far, I'll rebase my tree soon.
--
Best Regards,
Artem Bityutskiy
next prev parent reply other threads:[~2013-03-15 8:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 0:58 linux-next: manual merge of the l2-mtd tree with the mtd tree Stephen Rothwell
2013-03-15 8:32 ` Artem Bityutskiy [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-01-05 2:05 Stephen Rothwell
2013-03-15 0:53 Stephen Rothwell
2012-07-17 1:00 Stephen Rothwell
2012-07-25 15:21 ` Gerlando Falauto
2012-07-25 15:26 ` David Woodhouse
2012-07-25 15:36 ` Gerlando Falauto
2012-07-25 15:39 ` David Woodhouse
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=1363336377.11441.115.camel@sauron.fi.intel.com \
--to=dedekind1@gmail.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.