From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 1 Sep 2021 22:38:54 +0000 (+1000)
Subject: Merge remote-tracking branch 'kbuild/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=47d3f532ad09cc04b935d364069e6dd12a82cb43;p=users%2Fjedix%2Flinux-maple.git

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

47d3f532ad09cc04b935d364069e6dd12a82cb43
diff --cc MAINTAINERS
index fffe8f814700f,f5a650eea80be..242f62ea63f1e
--- a/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 arch/x86/Makefile
index d82d01490dd3b,0fa7dc73b5d88..7488cfbbd2f60
--- a/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 drivers/gpu/drm/i915/gt/intel_gt_requests.h
index 51dbe0e3294ef,fcc30a6e4fe94..d2969f68dd64a
--- a/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;