archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Andrew Morton <>
	Joe Perches <>, Jan Kara <>
Subject: linux-next: manual merge of the akpm with the ext3 tree
Date: Fri, 14 Oct 2011 17:34:23 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1386 bytes --]

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.
Stephen Rothwell          

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

                 reply	other threads:[~2011-10-14  6:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).