From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Kleikamp <dave.kleikamp@oracle•com>,
Al Viro <viro@zeniv•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the aio-direct tree with the vfs tree
Date: Mon, 11 Nov 2013 12:53:28 +1100 [thread overview]
Message-ID: <20131111125328.ef8f0641ccdbb28a0d0564da@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 647 bytes --]
Hi Dave,
Today's linux-next merge of the aio-direct tree got a conflict in
drivers/mtd/nand/nandsim.c between commit 72c2d5319200 ("file->f_op is
never NULL...") from the vfs tree and commit dd458300240b ("fs: create
file_readable() and file_writable() functions") from the aio-direct tree.
I fixed it up (I just used the aio-direct tree version) and can carry the
fix as necessary (no action is required).
There may be some question as to whether file_readable() needs to check
its filp argument for NULL, but that would require auditing all its call
sites.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-11-11 1:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-11 1:53 Stephen Rothwell [this message]
2013-11-11 1:59 ` linux-next: manual merge of the aio-direct tree with the vfs tree Stephen Rothwell
2013-11-11 3:20 ` Al Viro
-- strict thread matches above, loose matches on Subject: below --
2013-11-11 1:58 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=20131111125328.ef8f0641ccdbb28a0d0564da@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dave.kleikamp@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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