mirror of
https://github.com/torvalds/linux.git
synced 2026-01-25 07:47:50 +00:00
Merge branch 'for-6.15-printf-attribute' into for-linus
This commit is contained in:
@@ -1699,10 +1699,9 @@ char *escaped_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
|
||||
return buf;
|
||||
}
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#ifndef __clang__
|
||||
#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"
|
||||
#endif
|
||||
__diag_push();
|
||||
__diag_ignore(GCC, all, "-Wsuggest-attribute=format",
|
||||
"Not a valid __printf() conversion candidate.");
|
||||
static char *va_format(char *buf, char *end, struct va_format *va_fmt,
|
||||
struct printf_spec spec)
|
||||
{
|
||||
@@ -1717,7 +1716,7 @@ static char *va_format(char *buf, char *end, struct va_format *va_fmt,
|
||||
|
||||
return buf;
|
||||
}
|
||||
#pragma GCC diagnostic pop
|
||||
__diag_pop();
|
||||
|
||||
static noinline_for_stack
|
||||
char *uuid_string(char *buf, char *end, const u8 *addr,
|
||||
|
||||
Reference in New Issue
Block a user