From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Ryusuke Konishi <konishi.ryusuke@lab•ntt.co.jp>
Subject: linux-next: manual merge of the vfs tree with the nilfs tree
Date: Tue, 9 Jun 2009 11:11:14 +1000 [thread overview]
Message-ID: <20090609111114.2e879a50.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-06-09 1:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 1:11 Stephen Rothwell [this message]
2009-06-09 5:41 ` linux-next: manual merge of the vfs tree with the nilfs tree Ryusuke Konishi
-- 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=20090609111114.2e879a50.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=konishi.ryusuke@lab$(echo .)ntt.co.jp \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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