Re: linux-next: manual merge of the nilfs2 tree with the tree

[Ryusuke Konishi]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/