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

From: Ryusuke Konishi <ryusuke@osrg•net>
To: sfr@canb•auug.org.au, viro@ZenIV•linux.org.uk
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	konishi.ryusuke@lab•ntt.co.jp
Subject: Re: linux-next: manual merge of the vfs tree with the nilfs tree
Date: Tue, 09 Jun 2009 14:41:25 +0900 (JST)	[thread overview]
Message-ID: <20090609.144125.88495131.ryusuke@osrg.net> (raw)
In-Reply-To: <20090609111114.2e879a50.sfr@canb.auug.org.au>

Hi,
On Tue, 9 Jun 2009 11:11:14 +1000, Stephen Rothwell wrote:
> Hi Al,
> 
> Today's linux-next merge of the vfs tree got a conflicts in
> fs/nilfs2/super.c between commits from the nilfs tree and similar commits
> from the vfs tree.
> 
> The vfs and nilfs trees have different versions of the following patches:
> 
> nilfs2: get rid of sget use for checking if current mount is present
> nilfs2: simplify remaining sget() use
> nilfs2: correct exclusion control in nilfs_remount function
> 
> And the vfs tree has further commits that affect this files as well.
> 
> For now, I have used the vfs tree version.  Please sort this out.

I've confirmed that the patch series is applied to the vfs tree.

To avoid the conflict, I will remove them from my nilfs2 tree.

Thanks,
Ryusuke Konishi

next prev parent reply	other threads:[~2009-06-09  5:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-09  1:11 linux-next: manual merge of the vfs tree with the nilfs tree Stephen Rothwell
2009-06-09  5:41 ` Ryusuke Konishi [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-07-05  0:02 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=20090609.144125.88495131.ryusuke@osrg.net \
    --to=ryusuke@osrg$(echo .)net \
    --cc=konishi.ryusuke@lab$(echo .)ntt.co.jp \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=viro@ZenIV$(echo .)linux.org.uk \
    /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