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,
"Prasad Joshi" <prasadjoshi.linux@gmail•com>,
"\"Jörn Engel\"" <joern@logfs•org>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the logfs tree
Date: Tue, 03 Jan 2012 09:45:45 +0200 [thread overview]
Message-ID: <1325576745.8917.15.camel@sauron.fi.intel.com> (raw)
In-Reply-To: <20120103140029.2f996dab9bdfd3ec5c876045@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
On Tue, 2012-01-03 at 14:00 +1100, Stephen Rothwell wrote:
> Hi Artem,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> fs/logfs/dev_mtd.c between commit d1cc3ad397f2 ("Logfs: Allow NULL
> block_isbad() methods") from the logfs tree and commit 957afd905eda
> ("logfs: do not use 'mtd->block_isbad' directly") from the l2-mtd tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks Stephen, this fix up is good.
--
Best Regards,
Artem Bityutskiy
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-01-03 7:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-03 3:00 linux-next: manual merge of the l2-mtd tree with the logfs tree Stephen Rothwell
2012-01-03 7:45 ` Artem Bityutskiy [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-12-28 1:48 Stephen Rothwell
2011-12-28 8:52 ` Artem Bityutskiy
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=1325576745.8917.15.camel@sauron.fi.intel.com \
--to=dedekind1@gmail$(echo .)com \
--cc=joern@logfs$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=prasadjoshi.linux@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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