From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jan Kara <jack@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Joe Perches <joe@perches.com>
Subject: linux-next: manual merge of the ext3 tree with Linus' tree
Date: Wed, 2 Nov 2011 11:59:57 +1100 [thread overview]
Message-ID: <20111102115957.debce4217875e9f7d4e427da@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]
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@canb.auug.org.au
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 #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-11-02 1:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-02 0:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-18 0:32 linux-next: manual merge of the ext3 tree with Linus' tree Stephen Rothwell
2012-01-10 1:22 Stephen Rothwell
2012-01-10 12:01 ` Jan Kara
2010-05-22 5:45 Stephen Rothwell
2010-05-25 21:55 ` Jan Kara
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111102115957.debce4217875e9f7d4e427da@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jack@suse.cz \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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).