Hi, > -----Original Message----- > From: Jani Nikula [mailto:jani.nikula@xxxxxxxxx] > Sent: Wednesday, June 05, 2019 10:22 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: jani.nikula@xxxxxxxxx; kbuild test robot <lkp@xxxxxxxxx>; Chris Wilson > <chris@xxxxxxxxxxxxxxxxxx>; Yamada, Masahiro/山田 真弘 > <yamada.masahiro@xxxxxxxxxxxxx>; Sam Ravnborg <sam@xxxxxxxxxxxx> > Subject: [PATCH] drm/i915: rename header test build commands to avoid > conflicts > > We have a local hack to test if headers are self-contained, while > upstreaming a proper generic solution in kbuild [1]. Now that both have > found themselves in linux-next, the identical cmd_header_test build > commands conflict, leading to errors such as: > > >> drivers/gpu/drm/i915/header_test_intel_audio.c:1:10: fatal error: > >> drivers/gpu/drm/i915/intel_audio.h: No such file or directory > #include "drivers/gpu/drm/i915/intel_audio.h" > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Rename the i915 local build command until the proper kbuild solution > finds its way to Linus' master and gets backported to our tree, and we > can finally switch over. > > Note that since the kbuild header test requires CONFIG_HEADER_TEST=y, > and our hack requires our debug option CONFIG_DRM_I915_WERROR=y, this is > likely hit only by build test bots. > > [1] http://marc.info/?i=20190604124248.5564-1-jani.nikula@xxxxxxxxx > > Reported-by: kbuild test robot <lkp@xxxxxxxxx> > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> > Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- This is not really queued up yet. So, we can squash fix-up to avoid 0day bot report. I attached two patches. 00001-FIXUP1.patch is a one-liner fixup. If you want to clean up your Makefile by yourself later, I will squash it. If you want to switch to the generic notation now, I will squash 0001-FIXUP2.patch. Either is OK for me. Thanks. Masahiro Yamada
Attachment:
0001-FIXUP1.patch
Description: 0001-FIXUP1.patch
Attachment:
0001-FIXUP2.patch
Description: 0001-FIXUP2.patch
_______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
