On Mon, Oct 05, 2026 at 12:54:00PM +0200, Mark Brown wrote: > 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
> 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) This is wrong - it needs the spaces.
signature.asc
Description: PGP signature
