linux-kernel - linux-next: manual merge of the akpm with the ext3 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 14 Oct 2011 17:34:23 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Perches <joe@...ches.com>, Jan Kara <jack@...e.cz>
Subject: linux-next: manual merge of the akpm with the ext3 tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/udf/udfdecl.h between various commits from the ext3 tree and commit
2ea9eff85131 ("treewide: use __printf not __attribute__((format
(printf,...)))") from the scsi-post-merge tree.

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

diff --cc fs/udf/udfdecl.h
index f7273fb,4a33c72..0000000
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@@ -18,21 -16,6 +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,
++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,
++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

Content of type "application/pgp-signature" skipped