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,
Mikulas Patocka <mpatocka@redhat.com>, Jan Kara <jack@suse.cz>
Subject: linux-next: manual merge of the vfs tree with the ext3 tree
Date: Thu, 5 Jan 2012 13:06:09 +1100 [thread overview]
Message-ID: <20120105130609.2e4915ff183727456b527477@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
include/linux/fs.h between commit 4789fd4495a4 ("quota: Fix deadlock with
suspend and quotas") from the ext3 tree and commit cf31e70d6cf9 ("vfs:
new helper - vfs_ustat()") from the vfs tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/fs.h
index 3aba12c,7aacf31..0000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2531,8 -2489,6 +2489,7 @@@ extern void put_filesystem(struct file_
extern struct file_system_type *get_fs_type(const char *name);
extern struct super_block *get_super(struct block_device *);
extern struct super_block *get_active_super(struct block_device *bdev);
- extern struct super_block *user_get_super(dev_t);
+extern void put_super(struct super_block *sb);
extern void drop_super(struct super_block *sb);
extern void iterate_supers(void (*)(struct super_block *, void *), void *);
extern void iterate_supers_type(struct file_system_type *,
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-01-05 2:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-05 2:06 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
2015-03-18 0:32 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=20120105130609.2e4915ff183727456b527477@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mpatocka@redhat.com \
--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).