Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 15 Feb 2021 09:39:08 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Hans de Goede <hdegoede@redhat.com>,
        Mark Gross <mark.gross@intel.com>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Patrik Jakobsson <patrik.r.jakobsson@gmail.com>,
        Thomas Zimmermann <tzimmermann@suse.de>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the
 drm-misc tree
Message-ID: <20210215093908.06e349bf@canb.auug.org.au>
In-Reply-To: <20210204155846.5aef94a8@canb.auug.org.au>
References: <20210204155846.5aef94a8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fcEgAKpFpYpY8sFQopChY8R";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/fcEgAKpFpYpY8sFQopChY8R
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 4 Feb 2021 15:58:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>=20
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>=20
>   drivers/gpu/drm/gma500/Kconfig
>   drivers/gpu/drm/gma500/mdfld_device.c
>   drivers/gpu/drm/gma500/mdfld_dsi_output.c
>   drivers/gpu/drm/gma500/mdfld_output.c
>   drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
>=20
> between commits:
>=20
>   b51035c200bd ("drm/gma500: Remove Medfield support")

Now

  e1da811218d2 ("drm/gma500: Remove Medfield support")

>   837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option")

Now

  26499e0518a7 ("drm/gma500: Drop DRM_GMA3600 config option")

>=20
> from the drm-misc tree and commit:
>=20
>   bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API")
>   25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks")
>=20
> from the drivers-x86 tree.
>=20
> I fixed it up (the former removed the text that was updated by the
> latter and removed the last 4 files) 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.

With the merge window about to open, this is a reminder that this
conflict still exists.

The two drivers-x86 tree commits have also been merged into the pm tree.
--=20
Cheers,
Stephen Rothwell

--Sig_/fcEgAKpFpYpY8sFQopChY8R
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAppowACgkQAVBC80lX
0Gxl3wgAhhEyvRY4qiXMEtT4FpGLU1UyQNXQFRtdXb/dKQVXzZZCuqH3Gx5V18i/
mcXC55FKpS2uPSBUdk37HTQTdrhtolvI2CN52jB3afpcVQgIt+g13WkPl1oYil9v
NxvZsMn8RV1Hdy/9ROGxb5I3ASENJsCEpTwzByMU19C3udFB/PGTBSkanYoxuES+
fsrBPbGw9/s6GQWsrC4opfCDE+gUdehkRambSJhWjbAS0MeWdOD6oaqLJp5bZm3A
55AO0txPTZLKfbcW5l/sXCHJz3OUulfLNnih0LlZtvxtPJ8TDwzWmpP2uAeV0ZX0
I/gYSyPFNwwlMmXbToELUic6I6BStA==
=wY4n
-----END PGP SIGNATURE-----

--Sig_/fcEgAKpFpYpY8sFQopChY8R--