Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Cleanup metadata flags handling
  udf: Skip mirror metadata FE loading when metadata FE is ok
  ext3: Allow quota file use root reservation
  udf: Remove web reference from UDF MAINTAINERS entry
  quota: Drop path reference on error exit from quotactl
  udf: Neaten udf_debug uses
  udf: Neaten logging output, use vsprintf extension %pV
  udf: Convert printks to pr_<level>
  udf: Rename udf_warning to udf_warn
  udf: Rename udf_error to udf_err
  udf: Promote some debugging messages to udf_error
  ext3: Remove the obsolete broken EXT3_IOC32_WAIT_FOR_READONLY.
  udf: Add readpages support for udf.
  ext3/balloc.c: local functions should be static
  ext2: fix the outdated comment in ext2_nfs_get_inode()
  ext3: remove deprecated oldalloc
  fs/ext3/balloc.c: delete useless initialization
  fs/ext2/balloc.c: delete useless initialization
  ext3: fix message in ext3_remount for rw-remount case
  ext3: Remove i_mutex from ext3_sync_file()

Fix up trivial (printf format cleanup) conflicts in fs/udf/udfdecl.h

diff --cc MAINTAINERS
Simple merge

diff --cc fs/quota/quota.c
Simple merge

diff --cc fs/udf/udfdecl.h
index dc8a8dcc5ae101d70cec4b5bd05a532f45d62e39,79aae3fe7b559b24bc009675c2729cce3a2e71a8..f34e6fc0cdaa430d7f787133134ff3309bc97356
--- 1/fs/udf/udfdecl.h
--- 2/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@@ -16,6 -18,21 +18,19 @@@
  #define UDF_PREALLOCATE
  #define UDF_DEFAULT_PREALLOC_BLOCKS   8
  
 -__attribute__((format(printf, 3, 4)))
 -extern void _udf_err(struct super_block *sb, const char *function,
 -                   const char *fmt, ...);
++extern __printf(3, 4) void _udf_err(struct super_block *sb,
++              const char *function, const char *fmt, ...);
+ #define udf_err(sb, fmt, ...)                                 \
+       _udf_err(sb, __func__, fmt, ##__VA_ARGS__)
+ 
 -__attribute__((format(printf, 3, 4)))
 -extern void _udf_warn(struct super_block *sb, const char *function,
 -                    const char *fmt, ...);
++extern __printf(3, 4) void _udf_warn(struct super_block *sb,
++              const char *function, const char *fmt, ...);
+ #define udf_warn(sb, fmt, ...)                                        \
+       _udf_warn(sb, __func__, fmt, ##__VA_ARGS__)
+ 
+ #define udf_info(fmt, ...)                                    \
+       pr_info("INFO " fmt, ##__VA_ARGS__)
+ 
  #undef UDFFS_DEBUG
  
  #ifdef UDFFS_DEBUG

diff --cc include/linux/ext3_fs.h
Simple merge