linux-next: manual merge of the ext3 tree with Linus' tree

[Stephen Rothwell]

Hi Jan,

Today's linux-next merge of the ext3 tree got a conflict in
fs/udf/udfdecl.h between commit b9075fa968a0 ("treewide: use __printf not
__attribute__((format(printf,...)))") from Linus' tree and commit
7e273e3b41e3 ("udf: Promote some debugging messages to udf_error") from
the ext3 tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/udf/udfdecl.h
index dc8a8dc,79aae3f..0000000
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@@ -16,6 -18,21 +18,21 @@@
  #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

Attachment: pgp00000.pgp
Description: PGP signature