Merge remote-tracking branch 'kbuild/for-next'

diff --cc MAINTAINERS
index fffe8f814700fa4a182ef8fc701407be960d7123,f5a650eea80beee4ec692b64108d842a66eaac51..242f62ea63f1e2f9d4ad8123ab66d00838d56a34
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4520,9 -4498,10 +4520,10 @@@ L:    clang-built-linux@googlegroups.co
  S:    Supported
  W:    https://clangbuiltlinux.github.io/
  B:    https://github.com/ClangBuiltLinux/linux/issues
 -C:    irc://chat.freenode.net/clangbuiltlinux
 +C:    irc://irc.libera.chat/clangbuiltlinux
  F:    Documentation/kbuild/llvm.rst
  F:    include/linux/compiler-clang.h
+ F:    scripts/Makefile.clang
  F:    scripts/clang-tools/
  K:    \b(?i:clang|llvm)\b
  

diff --cc Makefile
Simple merge

diff --cc arch/s390/Makefile
Simple merge

diff --cc arch/s390/boot/pgm_check_info.c
Simple merge

diff --cc arch/x86/Makefile
index d82d01490dd3ba04bddb5fb6daad435d137626b1,0fa7dc73b5d88f61de14c2a20b62ef5c471eb4a6..7488cfbbd2f606b4a25664dd7153babd5d301800
--- 1/arch/x86/Makefile
--- 2/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@@ -70,10 -72,10 +70,10 @@@ ifeq ($(CONFIG_X86_32),y
          # Align the stack to the register width instead of using the default
          # alignment of 16 bytes. This reduces stack usage and the number of
          # alignment instructions.
 -        KBUILD_CFLAGS += $(call cc-option,$(cc_stack_align4))
 +        KBUILD_CFLAGS += $(cc_stack_align4)
  
          # CPU-specific tuning. Anything which can be shared with UML should go here.
-         include arch/x86/Makefile_32.cpu
+         include $(srctree)/arch/x86/Makefile_32.cpu
          KBUILD_CFLAGS += $(cflags-y)
  
          # temporary until string.h is fixed

diff --cc crypto/Makefile
Simple merge

diff --cc drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gt_requests.h
index 51dbe0e3294ef07351d59184b28b68422ec9c90e,fcc30a6e4fe946e9e9d17e39dacc38cc300f379e..d2969f68dd64a870291593fa8da6f7d82426c977
--- 1/drivers/gpu/drm/i915/gt/intel_gt_requests.h
--- 2/drivers/gpu/drm/i915/gt/intel_gt_requests.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.h
@@@ -6,8 -6,6 +6,8 @@@
  #ifndef INTEL_GT_REQUESTS_H
  #define INTEL_GT_REQUESTS_H
  
- #include <stddef.h>
++#include <linux/stddef.h>
 +
  struct intel_engine_cs;
  struct intel_gt;
  struct intel_timeline;

diff --cc drivers/gpu/drm/msm/disp/msm_disp_snapshot.h
Simple merge

diff --cc include/linux/filter.h
Simple merge

diff --cc lib/Kconfig.debug
Simple merge