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:   Thu, 4 Feb 2021 15:58:46 +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>
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: linux-next: manual merge of the drivers-x86 tree with the drm-misc
 tree
Message-ID: <20210204155846.5aef94a8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/vXMANa1gQE/6.UO58AyQ+3L";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/vXMANa1gQE/6.UO58AyQ+3L
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  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

between commits:

  b51035c200bd ("drm/gma500: Remove Medfield support")
  837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option")

from the drm-misc tree and commit:

  bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API")
  25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks")

from the drivers-x86 tree.

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/vXMANa1gQE/6.UO58AyQ+3L
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAbfwYACgkQAVBC80lX
0GwxMwf/QawMM9sngMztt4iWCkh2mZAwbY53aT65k+mzk/du8vDr+MMA8NGnYAFY
UUp0zhhDvmdrClHEIOl4R3QnXabIzWcBiURnrcKiSJXbTVapYGXXJ26hkgJDGuRO
sOdwtCS+rzTKZqk+fMwgqU9vPokz21UMjCgCFC9ZBrzoAHyWa5KhyZMTqy+hE+15
vmajV32ryu9tP+al4lwKyfGRKia6vNA8YTfiV4+8uGg+nk1r0vJDnAFXsrwk+yzF
SWse70ZbtRCvShFb/d3+z/hT4aEzm+PPaW88nwO8LL9tsc3AtoFs3zD/DbH151V+
EDRLDV/a5YdWb0vMM9U0xCNxoJQBrQ==
=/Zsb
-----END PGP SIGNATURE-----

--Sig_/vXMANa1gQE/6.UO58AyQ+3L--