From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jani Nikula <jani.nikula@intel.com>,
Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: linux-next: manual merge of the drm tree with the kbuild tree
Date: Tue, 9 Jul 2019 09:29:19 +1000 [thread overview]
Message-ID: <20190709092919.475162ab@canb.auug.org.au> (raw)
In-Reply-To: <20190619141949.38e661e6@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 3000 bytes --]
Hi all,
On Wed, 19 Jun 2019 14:19:49 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-07-08 23:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 4:19 linux-next: manual merge of the drm tree with the kbuild tree Stephen Rothwell
2019-06-19 7:38 ` Jani Nikula
2019-07-08 23:29 ` Stephen Rothwell [this message]
2019-09-04 6:46 Stephen Rothwell
2019-09-04 23:43 ` Nick Desaulniers
2019-09-15 21:47 Mark Brown
2019-09-16 21:06 ` Nick Desaulniers
2019-09-16 22:18 ` Mark Brown
2019-11-18 0:17 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190709092919.475162ab@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).