linux-next: manual merge of the drm tree with the origin tree

[Mark Brown]

Hi all,

Today's linux-next merge of the drm tree got conflicts in:

  drivers/gpu/drm/amd/display/dc/dml2_0/Makefile
  drivers/gpu/drm/amd/display/dc/dml/Makefile

between commits:

  18779dd84515d ("drm/amd/display: Bump frame warning limit for clang builds of 
dml")
  15814c01ac576 ("drm/amd/display: Bump frame warning limit for all builds of 
dml")
  fbc988f236a60 ("drm/amd/display: Fix sanitizer check for the DML frame size 
limit")

from the origin tree and commits:

  7e3422ee337f9 ("drm/amd/display: Add dml2_core_dcn6_calcs function pointer 
table")
  ebf8b0fd8508b ("drm/amd/display: Relax DML frame limit with UBSAN")
  21711b6e66bb7 ("drm/amd/display: Bump frame warning limit for clang builds of 
dml")
  76b9706e7fa1a ("drm/amd/display: Bump frame warning limit for all builds of 
dml")

from the drm tree.

I fixed it up (see below) 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.

diff --cc drivers/gpu/drm/amd/display/dc/dml/Makefile
index eb4ce5b1ecfbb,91465ac05c971..0000000000000
--- a/drivers/gpu/drm/amd/display/dc/dml/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile
@@@ -29,7 -29,7 +29,7 @@@ dml_ccflags := $(CC_FLAGS_FPU
  dml_rcflags := $(CC_FLAGS_NO_FPU)
  
  ifneq ($(CONFIG_FRAME_WARN),0)
-     ifneq ($(filter y,$(CONFIG_KASAN) $(CONFIG_KCSAN) $(CONFIG_UBSAN)),)
 -    ifeq ($(filter y,$(CONFIG_KASAN)$(CONFIG_KCSAN)$(CONFIG_UBSAN)),y)
++    ifneq ($(filter y,$(CONFIG_KASAN)$(CONFIG_KCSAN)$(CONFIG_UBSAN)),y)
          ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_COMPILE_TEST),yy)
              frame_warn_limit := 4096
          else
diff --cc drivers/gpu/drm/amd/display/dc/dml2_0/Makefile
index 289bac08c82c1,e8bd061be05c1..0000000000000
--- a/drivers/gpu/drm/amd/display/dc/dml2_0/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dml2_0/Makefile
@@@ -28,7 -28,7 +28,7 @@@ dml2_ccflags := $(CC_FLAGS_FPU
  dml2_rcflags := $(CC_FLAGS_NO_FPU)
  
  ifneq ($(CONFIG_FRAME_WARN),0)
-     ifneq ($(filter y,$(CONFIG_KASAN) $(CONFIG_KCSAN) $(CONFIG_UBSAN)),)
 -    ifeq ($(filter y,$(CONFIG_KASAN)$(CONFIG_KCSAN)$(CONFIG_UBSAN)),y)
++    ifneq ($(filter y,$(CONFIG_KASAN)$(CONFIG_KCSAN)$(CONFIG_UBSAN)),y)
          ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_COMPILE_TEST),yy)
              frame_warn_limit := 4096
          else

signature.asc
Description: PGP signature