mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
To: sfr@canb.auug.org.au
Cc: konishi.ryusuke@lab.ntt.co.jp, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org, npiggin@kernel.dk
Subject: Re: linux-next: manual merge of the nilfs2 tree with the tree
Date: Mon, 10 Jan 2011 14:58:23 +0900 (JST)	[thread overview]
Message-ID: <20110110.145823.220041803.ryusuke@osrg.net> (raw)
In-Reply-To: <20110110120746.7cd287b0.sfr@canb.auug.org.au>

On Mon, 10 Jan 2011 12:07:46 +1100, Stephen Rothwell wrote:
> Hi Ryusuke,
> 
> Today's linux-next merge of the nilfs2 tree got a conflict in
> fs/nilfs2/nilfs.h between commit b74c79e99389cd79b31fcc08f82c24e492e63c7e
> ("fs: provide rcu-walk aware permission i_ops") from Linus' tree and
> commit aa9ded135baf342ec5a299b254f0e0dbd5c3c0f0 ("nilfs2: do not pass sbi
> to functions which can get it from inode") from the nilfs2 tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks Stephen.  The fix looks good to me.

I'll apply it soon and resolve the conflict.

Ryusuke Konishi

      reply	other threads:[~2011-01-10  5:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-10  1:07 Stephen Rothwell
2011-01-10  5:58 ` Ryusuke Konishi [this message]

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=20110110.145823.220041803.ryusuke@osrg.net \
    --to=konishi.ryusuke@lab.ntt.co.jp \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=npiggin@kernel.dk \
    --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
all inboxes | Powered by JetHome®