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,
Jan Kara <jack@suse•cz>, Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the vfs tree with the ext3 tree
Date: Fri, 28 May 2010 11:31:20 +1000 [thread overview]
Message-ID: <20100528113120.b7fe818a.sfr@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/ufs/file.c
between commit 8f45c33decf62e1aaaa9411aae8fef6a38f95845 ("ufs: Remove
dead quota code") from the ext3 tree and commit
8f1edffdb5a76f205cf45070e1552ee8b2239a2b ("rename the generic fsync
implementations") from the vfs tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/ufs/file.c
index 73655c6,d4c30d1..0000000
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@@ -40,7 -41,7 +40,7 @@@ const struct file_operations ufs_file_o
.write = do_sync_write,
.aio_write = generic_file_aio_write,
.mmap = generic_file_mmap,
- .open = dquot_file_open,
+ .open = generic_file_open,
- .fsync = simple_fsync,
+ .fsync = generic_file_fsync,
.splice_read = generic_file_splice_read,
};
next reply other threads:[~2010-05-28 1:31 UTC|newest]
Thread overview: 13+ 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 --
2011-07-18 3:36 linux-next: manual merge of the vfs tree with the ext3 tree Stephen Rothwell
2011-07-18 19:32 ` Jan Kara
2012-01-05 2:06 Stephen Rothwell
2015-03-18 0:32 Stephen Rothwell
2017-11-08 22:55 Stephen Rothwell
2018-06-01 1:56 Stephen Rothwell
2018-06-01 15:32 ` Jan Kara
2018-06-11 23:53 ` Stephen Rothwell
2018-11-27 23:10 Stephen Rothwell
2019-01-02 1:09 Stephen Rothwell
2022-09-26 13:01 broonie
2022-10-03 22:56 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=20100528113120.b7fe818a.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=jack@suse$(echo .)cz \
--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