Hi all,
On Wed, 19 Jun 2019 14:19:49 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/Makefile.header-test
>
> between commit:
>
> e846f0dc57f4 ("kbuild: add support for ensuring headers are self-contained")
>
> from the kbuild tree and commits:
>
> 112ed2d31a46 ("drm/i915: Move GraphicsTechnology files under gt/")
> d91e657876a9 ("drm/i915: Introduce struct intel_wakeref")
> aab30b85c97a ("drm/i915: ensure more headers remain self-contained")
> b375d0ef2589 ("drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h")
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/i915/Makefile.header-test
> index 639b596a06a9,3a9663002d4a..000000000000
> --- a/drivers/gpu/drm/i915/Makefile.header-test
> +++ b/drivers/gpu/drm/i915/Makefile.header-test
> @@@ -2,18 -2,28 +2,28 @@@
> # Copyright © 2019 Intel Corporation
>
> # Test the headers are compilable as standalone units
> -header_test := \
> +header-test-$(CONFIG_DRM_I915_WERROR) := \
> i915_active_types.h \
> + i915_debugfs.h \
> + i915_drv.h \
> i915_gem_context_types.h \
> + i915_gem_pm.h \
> + i915_irq.h \
> + i915_params.h \
> i915_priolist_types.h \
> + i915_reg.h \
> i915_scheduler_types.h \
> i915_timeline_types.h \
> + i915_utils.h \
> + intel_acpi.h \
> + intel_atomic.h \
> intel_atomic_plane.h \
> intel_audio.h \
> + intel_bios.h \
> intel_cdclk.h \
> intel_color.h \
> + intel_combo_phy.h \
> intel_connector.h \
> - intel_context_types.h \
> intel_crt.h \
> intel_csr.h \
> intel_ddi.h \
> @@@ -31,7 -54,22 +54,12 @@@
> intel_pipe_crc.h \
> intel_pm.h \
> intel_psr.h \
> + intel_quirks.h \
> + intel_runtime_pm.h \
> intel_sdvo.h \
> + intel_sideband.h \
> intel_sprite.h \
> intel_tv.h \
> - intel_workarounds_types.h
> + intel_uncore.h \
> + intel_vdsc.h \
> + intel_wakeref.h
> -
> -quiet_cmd_header_test = HDRTEST $@
> - cmd_header_test = echo "\#include \"$(<F)\"" > $@
> -
> -header_test_%.c: %.h
> - $(call cmd,header_test)
> -
> -i915-$(CONFIG_DRM_I915_WERROR) += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
> -
> -clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
Attachment:
pgpJWRUWM7lcl.pgp
Description: OpenPGP digital signature
