From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E945C606CF for ; Mon, 8 Jul 2019 23:29:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D654A2166E for ; Mon, 8 Jul 2019 23:29:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="qFhXDRL7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727684AbfGHX30 (ORCPT ); Mon, 8 Jul 2019 19:29:26 -0400 Received: from ozlabs.org ([203.11.71.1]:44651 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726620AbfGHX30 (ORCPT ); Mon, 8 Jul 2019 19:29:26 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 45jM9D4bZLz9sML; Tue, 9 Jul 2019 09:29:20 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1562628562; bh=VHvYMoJapjy9cWdQwHjc3A/mmaTuFfvV4PE1mtlmIJQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=qFhXDRL7XNzzjJTytG2LGqfsU8T58tXW/CUa6uxwFJoUVIE6H90QY89dxGl7CxJU7 /sS4G2g3YyDx0QPy689sEhBu0fuM5pX/76ERNHr7bvc4tqRZptofati+w/7Execlim DMP6dJ3Vg4eeebmOcYT8hkoud+IqPAISt2mnbKFGT+hpTXmp/aAYAgOZBjcc532XlT ntcumcLThYOZ9cu+U8VXk1Mw9/eUe8QiS3e0eJfGWGKXIvOl3g/nIjMYChQj1uNrPA UYkAVY3fvQMLxBFjVpIsgRl8KTnDRu+a4JkBaOMcwyCxAcGZrP1P1Vsqi/0DW4rOEA /d0cGiVmqQT9w== Date: Tue, 9 Jul 2019 09:29:19 +1000 From: Stephen Rothwell To: Dave Airlie , DRI , Masahiro Yamada Cc: Linux Next Mailing List , Linux Kernel Mailing List , Jani Nikula , Chris Wilson Subject: Re: linux-next: manual merge of the drm tree with the kbuild tree Message-ID: <20190709092919.475162ab@canb.auug.org.au> In-Reply-To: <20190619141949.38e661e6@canb.auug.org.au> References: <20190619141949.38e661e6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/1TCOlj/Ral1M1aAYm4lXYnd"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/1TCOlj/Ral1M1aAYm4lXYnd Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi all, On Wed, 19 Jun 2019 14:19:49 +1000 Stephen Rothwell = wrote: >=20 > Today's linux-next merge of the drm tree got a conflict in: >=20 > drivers/gpu/drm/i915/Makefile.header-test >=20 > between commit: >=20 > e846f0dc57f4 ("kbuild: add support for ensuring headers are self-contai= ned") >=20 > from the kbuild tree and commits: >=20 > 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") >=20 > from the drm tree. >=20 > 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. >=20 > --=20 > Cheers, > Stephen Rothwell >=20 > 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 =C2=A9 2019 Intel Corporation > =20 > # Test the headers are compilable as standalone units > -header_test :=3D \ > +header-test-$(CONFIG_DRM_I915_WERROR) :=3D \ > 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 =3D HDRTEST $@ > - cmd_header_test =3D echo "\#include \"$( $@ > - > -header_test_%.c: %.h > - $(call cmd,header_test) > - > -i915-$(CONFIG_DRM_I915_WERROR) +=3D $(foreach h,$(header_test),$(patsub= st %.h,header_test_%.o,$(h))) > - > -clean-files +=3D $(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. --=20 Cheers, Stephen Rothwell --Sig_/1TCOlj/Ral1M1aAYm4lXYnd Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0j0c8ACgkQAVBC80lX 0GzYlwf+Ibky8sEyD897C+IAn15Sk66w33x8LXGQ9h4ETe9b9zcGRP4UKiq2r/AF Vh0e76ZvOXzdkaLwGy/2NMC3qp9v3j1CgzPoFjL7D1rW1BHY3oz//w0PE/S4Helz qoGZp22BaWoLKqsITRshsYIpWIl2L7lTTnm024n+zZPAs7FztfCZepgnlGMiwf09 LO7U11NdYNHMMbx/CJCvJXpUxmlNQBe1i7ZWI+aOCE5dF7GrEg77vuZW9idGxyJt v+uWKQ3Es55DkDa8TMmZ9k3F312lJfHXLHE0OdR9g2nMY/GQJe0r4YzCBzYm+5+L 0t1gmMH9J78hb89D583JZS0JOyzeSg== =d475 -----END PGP SIGNATURE----- --Sig_/1TCOlj/Ral1M1aAYm4lXYnd--