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:   Fri, 29 Oct 2021 11:48:40 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     John Harrison <John.C.Harrison@Intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Matthew Brost <matthew.brost@intel.com>
Subject: linux-next: manual merge of the drm tree with Linus' tree
Message-ID: <20211029114840.6a3a78bd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Xt5z.i2.qZV/j7OqA=Pyt6z";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Xt5z.i2.qZV/j7OqA=Pyt6z
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/gpu/drm/i915/i915_trace.h

between commit:

  9a4aa3a2f160 ("drm/i915: Revert 'guc_id' from i915_request tracepoint")

from Linus' tree and commit:

  3cb3e3434b9f ("drm/i915/guc: Move fields protected by guc->contexts_lock =
into sub structure")

from the drm tree.

I fixed it up (I used the former version) 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_/Xt5z.i2.qZV/j7OqA=Pyt6z
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmF7ROgACgkQAVBC80lX
0GwDjwf9ES1kV83+eTsl0RucN0MlLoR/a90yvyKRhvhlScgHdKUkuncE1mLzRUUi
9Vfe6eW0invRkjBkjabzTtQn/zwIArLe6k1Dcfv/IzY0OXWGgD9hsNYM28tSIpo0
FMYxt37NXrPJ2Zdv32n5UpU6WuZEcKAi3WnFrXCp25VOjducOy3M2fVJJ7/XmTsN
bUgBH+hyoVv07kVBlniRtMrKR1lczaSLD2v6hgAgGp/H68bK7EmF7EH7QWmUexYc
FaFukquqfUxbGktJn/e7+7GCDnBlYGZPif4qZ9AVPN+JWjUzQSXhIMSDE5iaWrwS
x2DjrMOjo3PF6Fbu/f2w4VS/Ho72bw==
=li/R
-----END PGP SIGNATURE-----

--Sig_/Xt5z.i2.qZV/j7OqA=Pyt6z--