From: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
To: sfr@canb.auug.org.au
Cc: arnd@arndb.de, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, jblunck@infradead.org,
konishi.ryusuke@lab.ntt.co.jp
Subject: Re: linux-next: manual merge of the bkl-vfs tree with the nilfs2 tree
Date: Wed, 15 Sep 2010 13:16:28 +0900 (JST) [thread overview]
Message-ID: <20100915.131628.69479307.ryusuke@osrg.net> (raw)
In-Reply-To: <20100915140114.81406c4f.sfr@canb.auug.org.au>
On Wed, 15 Sep 2010 14:01:14 +1000, Stephen Rothwell wrote:
> Hi Arnd,
>
> Today's linux-next merge of the bkl-vfs tree got a conflict in
> fs/nilfs2/super.c between commit 38999dca4fdc4a0d1b92a540bc0772a32b07388a
> ("nilfs2: do not allocate multiple super block instances for a device")
> from the nilfs2 tree and commit 3fec873dc6e9026d98e2359202fa50fd06ee7b64
> ("BKL: Remove BKL from NILFS2") from the bkl-vfs tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
The fix looks fine to me.
Thanks!
Ryusuke Konishi
next prev parent reply other threads:[~2010-09-15 4:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-15 4:01 linux-next: manual merge of the bkl-vfs tree with the nilfs2 tree Stephen Rothwell
2010-09-15 4:16 ` Ryusuke Konishi [this message]
2010-09-15 8:48 ` Arnd Bergmann
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=20100915.131628.69479307.ryusuke@osrg.net \
--to=konishi.ryusuke@lab.ntt.co.jp \
--cc=arnd@arndb.de \
--cc=jblunck@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).