From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Theodore Ts'o" <tytso@mit•edu>,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix•de>
Subject: linux-next: manual merge of the trivial tree with the ext4 tree
Date: Fri, 31 Dec 2010 12:57:21 +1100 [thread overview]
Message-ID: <20101231125721.3c3f4604.sfr@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
fs/ext4/ext4.h between commit 673c610033a8202c037ecd068c7a235495acda17
("ext4: Move struct ext4_mount_options from ext4.h to super.c") from the
ext4 tree and commit b595076a180a56d1bb170e6eceda6eb9d76f4cd3
("tree-wide: fix comment/printk typos") from the trivial 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 fs/ext4/ext4.h
index 2a73925,1f253a9..0000000
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@@ -561,7 -561,23 +561,7 @@@ struct ext4_new_group_data
#define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION
#endif
- /* Max physical block we can addres w/o extents */
-
-/*
- * Mount options
- */
-struct ext4_mount_options {
- unsigned long s_mount_opt;
- uid_t s_resuid;
- gid_t s_resgid;
- unsigned long s_commit_interval;
- u32 s_min_batch_time, s_max_batch_time;
-#ifdef CONFIG_QUOTA
- int s_jquota_fmt;
- char *s_qf_names[MAXQUOTAS];
-#endif
-};
-
+ /* Max physical block we can address w/o extents */
#define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF
/*
next reply other threads:[~2010-12-31 1:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-31 1:57 Stephen Rothwell [this message]
2010-12-31 16:15 ` linux-next: manual merge of the trivial tree with the ext4 tree Uwe Kleine-König
-- strict thread matches above, loose matches on Subject: below --
2009-11-25 7:34 Stephen Rothwell
2009-11-25 11:16 ` Jiri Kosina
2009-11-25 11:45 ` tytso
2009-11-25 11:56 ` Jiri Kosina
2009-11-25 12:25 ` 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=20101231125721.3c3f4604.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/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