linux-next: manual merge of the trivial tree with the ext4 tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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
  
  /*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/