From: Al Viro <viro@ZenIV.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dave Kleikamp <dave.kleikamp@oracle.com>,
Zach Brown <zab@zabbo.net>
Subject: Re: linux-next: manual merge of the vfs tree with the aio-direct tree
Date: Wed, 18 Sep 2013 03:00:35 +0100 [thread overview]
Message-ID: <20130918020035.GK13318@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20130918105638.6fa7c29605c14b408b7f5a7e@canb.auug.org.au>
On Wed, Sep 18, 2013 at 10:56:38AM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got conflicts in fs/nfs/direct.c
> and fs/nfs/file.c between commits b9517433d65d ("dio: Convert direct_IO
> to use iov_iter"), a8431c667ae8 ("nfs: add support for read_iter,
> write_iter") and a1b8ec384b73 ("nfs: simplify swap") from the aio-direct
> tree and commit c18d1ec44f7a ("nfs: use %p[dD] instead of open-coded (and
> often racy) equivalents") from the vfs tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Hrm... FWIW, I would greatly prefer to offload these printk patches to
NFS and NFSD trees. Didn't get around to that yet, but...
As for aio-direct... Two questions:
* had anybody tried to measure the effect on branch predictor from
introducing that method vector? Commit d6afd4c4 ("iov_iter: hide iovec
details behind ops function pointers")
* WTF does aforementioned commit lack its author's s-o-b? The same
goes for a lot of zab's commits in there...
next prev parent reply other threads:[~2013-09-18 2:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-18 0:56 linux-next: manual merge of the vfs tree with the aio-direct tree Stephen Rothwell
2013-09-18 2:00 ` Al Viro [this message]
2013-09-18 3:25 ` Dave Kleikamp
2013-09-18 17:06 ` Zach Brown
-- strict thread matches above, loose matches on Subject: below --
2013-09-05 3:02 Stephen Rothwell
2013-09-05 2:54 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=20130918020035.GK13318@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=dave.kleikamp@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=zab@zabbo.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.