Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Fri, 6 Oct 2023 12:44:47 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
        Daniel Vetter <daniel.vetter@ffwll.ch>
Cc:     Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Christian =?UTF-8?B?S8O2bmln?= <christian.koenig@amd.com>,
        Kees Cook <keescook@chromium.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the drm-msm-lumag tree with the
 drm-misc tree
Message-ID: <20231006124447.10031f6e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/eXIVIosoXmtrWkP4jtgIGQQ";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h

between commit:

  8f5d3daad715 ("drm/msm/dpu: Annotate struct dpu_hw_intr with __counted_by=
")

from the drm-misc tree and commits:

  eb7af0e86349 ("drm/msm/dpu: add helper to get IRQ-related data")
  07e7d96dcb08 ("drm/msm/dpu: make the irq table size static")

from the drm-msm-lumag tree.

I fixed it up (the latter 2 replaced what was updated by the former) 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_/eXIVIosoXmtrWkP4jtgIGQQ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUfZo8ACgkQAVBC80lX
0GzxjAgAoMVn3jWTorqxP+K3iyB+pqlcIgz90HiPbveLth6LEasVkPQQJsRKMUlt
MgH791r86UQGTWQi1YTAfhGxj+wBrXUFYXzAUjlYsGLyBY8+q/reb3Tt+IydPBTB
ZVWA50yhpS4c4jTkOKob8Y06hegR7anpPlypRxeSEU9beG8ZogLXN51FSGjiJBYX
HquwMYxEWAqHBTk10vzSEEDEg8wVdmr6rdv7Gz4MbBdaJhqKEZaxNTkVGXXuy+kn
jePWgxTaCPXNPzBW4+yJNVrkTdF4RklSCUoNuRKgFesWRLBnCabFVgwv7WVY4Ig1
2p5BV5lb3L4x5JS07YcBEx69kL29VA==
=D7A5
-----END PGP SIGNATURE-----

--Sig_/eXIVIosoXmtrWkP4jtgIGQQ--