public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

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: Wed, 28 Dec 2011 10:52:21 +0200	[thread overview]
Message-ID: <1325062341.1165.93.camel@sauron.fi.intel.com> (raw)
In-Reply-To: <20111228124833.80c36e5660fdd9fe0c8481ba@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 957 bytes --]

On Wed, 2011-12-28 at 12:48 +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  tree and commit 22aed0c2578c ("mtd:
> introduce mtd_block_isbad interface") from the l2-mtd tree.

Hi, thanks.

> I fixed it up (see below) and can carry the fix as necessary.  I am a
> little worried that the block_isbad member of struct mtd_info may be
> hidden in the future and so break the NULL checks here.

I will take care of all the direct use of "mtd->block_isbad" everywhere
during the 3.3 cycle. So far I just introduced the wrapper functions,
and amended all the users that coccinelle has found.

But it is also OK to use the pointers directly so far (in 3.2), and I
will take care of this by 3.3.

Thanks for taking care of the conflict.

-- 
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:[~2011-12-28  8:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-28  1:48 linux-next: manual merge of the l2-mtd tree with the logfs tree Stephen Rothwell
2011-12-28  8:52 ` Artem Bityutskiy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-01-03  3:00 Stephen Rothwell
2012-01-03  7:45 ` 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=1325062341.1165.93.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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox