From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Dec 2025 20:41:10 +0000 (+0900)
Subject: Merge tag 'auto-type-conversion-for-v6.19-rc1' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c752c21c90b808a059ae8e0070ff7566a65f8577;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'auto-type-conversion-for-v6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-auto

Pull __auto_type to auto conversion from Peter Anvin:
 "Convert '__auto_type' to 'auto', defining a macro for 'auto' unless
  C23+ is in use"

* tag 'auto-type-conversion-for-v6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-auto:
  tools/virtio: replace "__auto_type" with "auto"
  selftests/bpf: replace "__auto_type" with "auto"
  arch/x86: replace "__auto_type" with "auto"
  arch/nios2: replace "__auto_type" and adjacent equivalent with "auto"
  fs/proc: replace "__auto_type" with "const auto"
  include/linux: change "__auto_type" to "auto"
  compiler_types.h: add "auto" as a macro for "__auto_type"
---

c752c21c90b808a059ae8e0070ff7566a65f8577
diff --cc include/linux/compiler_types.h
index 45875903960ed,41172a28ce76d..1280693766b9d
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@@ -11,12 -11,21 +11,25 @@@
  #define __has_builtin(x) (0)
  #endif
  
 +/* Indirect macros required for expanded argument pasting, eg. __LINE__. */
 +#define ___PASTE(a, b) a##b
 +#define __PASTE(a, b) ___PASTE(a, b)
 +
  #ifndef __ASSEMBLY__
  
+ /*
+  * C23 introduces "auto" as a standard way to define type-inferred
+  * variables, but "auto" has been a (useless) keyword even since K&R C,
+  * so it has always been "namespace reserved."
+  *
+  * Until at some future time we require C23 support, we need the gcc
+  * extension __auto_type, but there is no reason to put that elsewhere
+  * in the source code.
+  */
+ #if __STDC_VERSION__ < 202311L
+ # define auto __auto_type
+ #endif
+ 
  /*
   * Skipped when running bindgen due to a libclang issue;
   * see https://github.com/rust-lang/rust-bindgen/issues/2244.