From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Josef Bacik <josef@redhat.com>,
Chris Mason <chris.mason@oracle.com>,
Nick Piggin <npiggin@suse.de>
Subject: linux-next: manual merge of the vfs tree with Linus' tree
Date: Fri, 28 May 2010 11:31:24 +1000 [thread overview]
Message-ID: <20100528113124.899dc9e2.sfr@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
include/linux/fs.h between commit
facd07b07d2a7988f5ce849558838cc953847637 ("direct-io: add a hook for the
fs to provide its own submit_bio function") from Linus' tree and commit
42e0df712d6a3573268d6be6bc97d113579e258c ("fs: introduce new truncate
sequence") from the vfs tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/fs.h
index 85e823a,357ebcf..0000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2251,11 -2251,10 +2252,15 @@@ static inline int xip_truncate_page(str
#endif
#ifdef CONFIG_BLOCK
+struct bio;
+typedef void (dio_submit_t)(int rw, struct bio *bio, struct inode *inode,
+ loff_t file_offset);
+void dio_end_io(struct bio *bio, int error);
+
+ ssize_t __blockdev_direct_IO_newtrunc(int rw, struct kiocb *iocb, struct inode *inode,
+ struct block_device *bdev, const struct iovec *iov, loff_t offset,
+ unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
+ int lock_type);
ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
struct block_device *bdev, const struct iovec *iov, loff_t offset,
unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
next reply other threads:[~2010-05-28 1:31 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-28 1:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-05 0:10 linux-next: manual merge of the vfs tree with Linus' tree Stephen Rothwell
2024-01-05 0:20 ` Steven Rostedt
2024-01-01 22:36 Stephen Rothwell
2020-07-28 1:09 Stephen Rothwell
2020-07-27 1:37 Stephen Rothwell
2020-03-31 23:55 Stephen Rothwell
2019-01-02 1:32 Stephen Rothwell
2019-01-02 1:18 Stephen Rothwell
2018-10-30 1:20 Stephen Rothwell
2018-06-01 1:52 Stephen Rothwell
2018-01-01 22:54 Stephen Rothwell
2017-12-03 23:05 Stephen Rothwell
2017-11-28 23:53 Stephen Rothwell
2017-11-30 23:36 ` Stephen Rothwell
2017-11-17 0:42 Stephen Rothwell
2017-03-30 0:07 Stephen Rothwell
2017-02-27 0:10 Stephen Rothwell
2017-02-27 8:28 ` David Howells
2017-01-22 23:36 Stephen Rothwell
2016-10-10 0:20 Stephen Rothwell
2016-05-19 1:17 Stephen Rothwell
2016-05-19 2:02 ` Steve French
2016-05-02 0:49 Stephen Rothwell
2016-05-02 0:43 Stephen Rothwell
2016-05-02 0:38 Stephen Rothwell
2016-03-13 23:24 Stephen Rothwell
2015-12-07 1:46 Stephen Rothwell
2015-02-22 0:57 Stephen Rothwell
2015-02-22 0:55 Stephen Rothwell
2015-02-22 0:51 Stephen Rothwell
2015-02-22 0:46 Stephen Rothwell
2015-01-23 1:10 Stephen Rothwell
2014-05-29 3:19 Stephen Rothwell
2014-04-22 1:17 Stephen Rothwell
2014-04-22 0:50 Stephen Rothwell
2014-04-22 0:44 Stephen Rothwell
2013-11-08 1:01 Stephen Rothwell
2013-09-05 2:59 Stephen Rothwell
2013-05-02 2:00 Stephen Rothwell
2013-05-02 1:55 Stephen Rothwell
2013-05-01 2:11 Stephen Rothwell
2013-04-29 1:38 Stephen Rothwell
2012-09-24 1:45 Stephen Rothwell
2012-07-30 0:41 Stephen Rothwell
2012-07-30 0:37 Stephen Rothwell
2012-02-14 0:54 Stephen Rothwell
2012-02-14 1:43 ` Al Viro
2012-01-09 1:11 Stephen Rothwell
2012-01-09 1:32 ` Linus Torvalds
2012-01-09 2:22 ` Stephen Rothwell
2012-01-09 2:14 ` Al Viro
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=20100528113124.899dc9e2.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chris.mason@oracle.com \
--cc=josef@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=npiggin@suse.de \
--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).