From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jan Blunck <jblunck@infradead.org>,
Ryusuke Konishi <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 10:48:43 +0200 [thread overview]
Message-ID: <201009151048.44071.arnd@arndb.de> (raw)
In-Reply-To: <20100915140114.81406c4f.sfr@canb.auug.org.au>
On Wednesday 15 September 2010, Stephen Rothwell wrote:
> 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.
Ok, thanks!
> P.S. Arndt, the first of the above bkl/vfs commits does not have a SOB
> line from you and has a bug (missing open brace) that is fixed in the
> second. Just in case you decide to rebase this branch at any point ...
I'm still rebasing all the branches while people take patches into their
own trees, so I'll fix this up soon. Thanks for the info.
Arnd
prev parent reply other threads:[~2010-09-15 8:48 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
2010-09-15 8:48 ` Arnd Bergmann [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=201009151048.44071.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=jblunck@infradead.org \
--cc=konishi.ryusuke@lab.ntt.co.jp \
--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).