From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Jan Kara <jack@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Fabian Frederick <fabf@skynet.be>, Christoph Hellwig <hch@lst.de>
Subject: linux-next: manual merge of the vfs tree with the ext3 tree
Date: Wed, 18 Mar 2015 11:32:34 +1100 [thread overview]
Message-ID: <20150318113234.6e74c175@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 793 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/udf/file.c between commit 13f0c2b0f67d ("udf: remove redundant
buffer_head.h includes") from the ext3 tree and commit 52858684778b
("fs: move struct kiocb to fs.h") from the vfs tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/udf/file.c
index dda8ea7012c6,7f885cc8b0b7..000000000000
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@@ -33,7 -33,8 +33,7 @@@
#include <linux/capability.h>
#include <linux/errno.h>
#include <linux/pagemap.h>
- #include <linux/aio.h>
-#include <linux/buffer_head.h>
+ #include <linux/uio.h>
#include "udf_i.h"
#include "udf_sb.h"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-18 0:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-18 0:32 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-03 22:56 linux-next: manual merge of the vfs tree with the ext3 tree Stephen Rothwell
2022-09-26 13:01 broonie
2019-01-02 1:09 Stephen Rothwell
2018-11-27 23:10 Stephen Rothwell
2018-06-01 1:56 Stephen Rothwell
2018-06-01 15:32 ` Jan Kara
2018-06-11 23:53 ` Stephen Rothwell
2017-11-08 22:55 Stephen Rothwell
2012-01-05 2:06 Stephen Rothwell
2011-07-18 3:36 Stephen Rothwell
2011-07-18 19:32 ` Jan Kara
2010-05-28 1:31 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=20150318113234.6e74c175@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=fabf@skynet.be \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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).