From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail•com>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Liao Yuanhong <liaoyuanhong@vivo•com>,
Miguel Ojeda <miguel.ojeda.sandonis@gmail•com>
Subject: linux-next: manual merge of the input tree with Linus' tree
Date: Wed, 20 Aug 2025 11:37:20 +1000 [thread overview]
Message-ID: <20250820113720.25631f7f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]
Hi all,
Today's linux-next merge of the input tree got a conflict in:
include/linux/sprintf.h
between commit:
0dec7201788b ("sprintf.h requires stdarg.h")
from Linus' tree (v6.16) and commit:
be06b53d3af0 ("lib/vsprintf: include stdarg.h from sprintf.h to provide va_list")
from the input tree.
This only happens because the input tree is still based on v6.16-rc1.
I fixed it up (I applied the following merge fix patch) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 20 Aug 2025 11:31:19 +1000
Subject: [PATCH] input: remove second addition of <linux/stdarg.h>
Cc: Liao Yuanhong <liaoyuanhong@vivo•com>
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
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.50.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-08-20 1:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-20 1:37 Stephen Rothwell [this message]
2025-08-21 14:57 ` linux-next: manual merge of the input tree with Linus' tree Miguel Ojeda
-- strict thread matches above, loose matches on Subject: below --
2024-08-20 1:23 Stephen Rothwell
2022-01-09 23:53 Stephen Rothwell
2021-11-03 23:21 Stephen Rothwell
2020-07-22 4:49 Stephen Rothwell
2013-11-12 1:58 Stephen Rothwell
2012-03-27 1:16 Stephen Rothwell
2012-03-27 7:33 ` Dmitry Torokhov
2010-12-14 2:26 Stephen Rothwell
2010-12-14 18:40 ` Dmitry Torokhov
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=20250820113720.25631f7f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=liaoyuanhong@vivo$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miguel.ojeda.sandonis@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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