From: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
To: Al Viro <viro-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org>,
Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
<linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org>
Subject: linux-next: manual merge of the vfs tree with the cifs tree
Date: Tue, 13 May 2014 13:16:16 +1000 [thread overview]
Message-ID: <20140513131616.59f41b7a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/cifs/cifsfs.c between commit 485c4e72d0f1 ("cifs: revalidate mapping
prior to satisfying aio_read request") from the cifs tree and commits
aad4f8bb42af ("switch simple generic_file_aio_read() users to
->read_iter()") and 3dae8750c368 ("cifs: switch to ->write_iter()")
from the vfs tree.
I fixed it up (I dropped the cifs commit, so this will need a better
fix ...) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-05-13 3:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-13 3:16 Stephen Rothwell [this message]
2014-05-13 10:49 ` linux-next: manual merge of the vfs tree with the cifs tree Jeff Layton
[not found] ` <20140513131616.59f41b7a-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2014-05-23 10:50 ` [PATCH] cifs: revalidate mapping prior to satisfying read_iter request with cache=loose Jeff Layton
[not found] ` <1400842221-12168-1-git-send-email-jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org>
2014-05-23 14:44 ` Jeff Layton
[not found] ` <20140523104424.26c0bad0-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2014-05-23 14:52 ` Steve French
[not found] ` <CAH2r5mvsv=vzhc=p-nxbv6XRVfaUS==A2ktb+ScGsFKaycMVxw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-05-23 15:33 ` Steve French
[not found] ` <CAH2r5msbPWwHZVZ=ZDbnHatt8QT2Q00ZnBgKw-yXLvEM8Ui3Jw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-05-23 15:35 ` Jeff Layton
-- strict thread matches above, loose matches on Subject: below --
2021-03-26 0:09 linux-next: manual merge of the vfs tree with the cifs tree Stephen Rothwell
2016-05-19 23:41 Stephen Rothwell
2012-06-25 2:11 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=20140513131616.59f41b7a@canb.auug.org.au \
--to=sfr-3fnu+uhb4dndw9hx6icosa@public.gmane.org \
--cc=jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=viro-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org \
/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