On Wed, 04 Dec 2024, Mark Brown <broonie@xxxxxxxxxx> wrote: > Hi all, > > After merging the drm-xe tree, today's linux-next build (x86 > allmodconfig) failed like this: > > In file included from /tmp/next/build/include/linux/module.h:22, > from /tmp/next/build/include/linux/device/driver.h:21, > from /tmp/next/build/include/linux/device.h:32, > from /tmp/next/build/include/linux/auxiliary_bus.h:11, > from /tmp/next/build/include/linux/intel_vsec.h:5, > from /tmp/next/build/drivers/gpu/drm/xe/xe_vsec.c:7: > /tmp/next/build/drivers/gpu/drm/xe/xe_vsec.c:233:18: error: expected ',' or ';' before 'INTEL_VSEC' > 233 | MODULE_IMPORT_NS(INTEL_VSEC); > | ^~~~~~~~~~ > /tmp/next/build/include/linux/moduleparam.h:26:61: note: in definition of macro '__MODULE_INFO' > 26 | = __MODULE_INFO_PREFIX __stringify(tag) "=" info > | ^~~~ > /tmp/next/build/include/linux/module.h:299:33: note: in expansion of macro 'MODULE_INFO' > 299 | #define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, ns) > | ^~~~~~~~~~~ > /tmp/next/build/drivers/gpu/drm/xe/xe_vsec.c:233:1: note: in expansion of macro 'MODULE_IMPORT_NS' > 233 | MODULE_IMPORT_NS(INTEL_VSEC); > | ^~~~~~~~~~~~~~~~ > > You need to merge up cdd30ebb1b9f36159d66f088b61aee264e649d7a ("module: > Convert symbol namespace to string literal") from mainline and fix up > for the changes in MODULE_IMPORT_NS. I'll apply a fixup for now. Commit cdd30ebb1b9f ("module: Convert symbol namespace to string literal") isn't even in a tagged release yet. We'll get it when -rc1 is out *and* backmerged to drm-next. BR, Jani. -- Jani Nikula, Intel