linux-kernel - linux-next: manual merge of the input tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250820113720.25631f7f@canb.auug.org.au>
Date: Wed, 20 Aug 2025 11:37:20 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Liao Yuanhong <liaoyuanhong@...o.com>, Miguel
 Ojeda <miguel.ojeda.sandonis@...il.com>
Subject: linux-next: manual merge of the input tree with Linus' tree

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@...b.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@...o.com>
Signed-off-by: Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped