include/linux/sprintf.h | 1 - 1 file changed, 1 deletion(-)
The header file <linux/stdarg.h> is already included on line 6. Remove the
redundant include.
Fixes: 0dec7201788b9 ("sprintf.h requires stdarg.h")
Signed-off-by: Liao Yuanhong <liaoyuanhong@vivo.com>
---
include/linux/sprintf.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/linux/sprintf.h b/include/linux/sprintf.h
index 8cb32b777d0b..e57a6d6fbd93 100644
--- a/include/linux/sprintf.h
+++ b/include/linux/sprintf.h
@@ -5,7 +5,6 @@
#include <linux/compiler_attributes.h>
#include <linux/stdarg.h>
#include <linux/types.h>
-#include <linux/stdarg.h>
int num_to_str(char *buf, int size, unsigned long long num, unsigned int width);
--
2.34.1
> The header file <linux/stdarg.h> is already included on line 6. Remove the > redundant include. You would like to omit a duplicate #include directive, don't you? Will a corresponding refinement become helpful for the summary phrase? Regards, Markus
On Tue, Aug 19, 2025 at 3:13 PM Liao Yuanhong <liaoyuanhong@vivo.com> wrote: > > The header file <linux/stdarg.h> is already included on line 6. Remove the > redundant include. > > Fixes: 0dec7201788b9 ("sprintf.h requires stdarg.h") I don't think this fixes that commit -- `stdarg.h` was not there back then. Instead, this commit be06b53d3af0 ("lib/vsprintf: include stdarg.h from sprintf.h to provide va_list") also added the line, and I assume Stephen only needs to drop one of the lines in this merge resolution next time: 3f413b9a3770 ("Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git") Thanks! Cheers, Miguel
Hi all, On Tue, 19 Aug 2025 15:37:20 +0200 Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> wrote: > > On Tue, Aug 19, 2025 at 3:13 PM Liao Yuanhong <liaoyuanhong@vivo.com> wrote: > > > > The header file <linux/stdarg.h> is already included on line 6. Remove the > > redundant include. > > > > Fixes: 0dec7201788b9 ("sprintf.h requires stdarg.h") > > I don't think this fixes that commit -- `stdarg.h` was not there back then. > > Instead, this commit > > be06b53d3af0 ("lib/vsprintf: include stdarg.h from sprintf.h to > provide va_list") > > also added the line, and I assume Stephen only needs to drop one of > the lines in this merge resolution next time: > > 3f413b9a3770 ("Merge branch 'next' of > https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git") I have done that today. -- Cheers, Stephen Rothwell
On 8/19/2025 9:37 PM, Miguel Ojeda wrote: > [You don't often get email from miguel.ojeda.sandonis@gmail.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] > > On Tue, Aug 19, 2025 at 3:13 PM Liao Yuanhong <liaoyuanhong@vivo.com> wrote: >> The header file <linux/stdarg.h> is already included on line 6. Remove the >> redundant include. >> >> Fixes: 0dec7201788b9 ("sprintf.h requires stdarg.h") > I don't think this fixes that commit -- `stdarg.h` was not there back then. > > Instead, this commit > > be06b53d3af0 ("lib/vsprintf: include stdarg.h from sprintf.h to > provide va_list") > > also added the line, and I assume Stephen only needs to drop one of > the lines in this merge resolution next time: > > 3f413b9a3770 ("Merge branch 'next' of > https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git") > > Thanks! > > Cheers, > Miguel Thank you for your feedback. Do I need to submit the v2 version without fixes? Regards, Liao
On Tue, Aug 19, 2025 at 4:18 PM Liao Yuanhong <liaoyuanhong@vivo.com> wrote: > > Thank you for your feedback. Do I need to submit the v2 version without > fixes? You're welcome! No, I don't think there is a need for a patch for this, since the issue was in a test merge, not in any particular branch or patch, as far as I can see. So I assume Stephen will simply fix at merge tomorrow. However, if this slips and lands e.g. in Linus' tree, then yes, a patch would be needed. Maintainers may mention it to Linus to try to avoid the same issue again in the "real" merge into mainline. I hope that helps! Cheers, Miguel
© 2016 - 2025 Red Hat, Inc.