Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i8771445c:Fastmail
Date:   Fri, 18 Nov 2022 10:20:20 +0100
From:   Maxime Ripard <maxime@cerno.tech>
To:     Nathan Chancellor <nathan@kernel.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        =?utf-8?B?Sm9zw6kgRXhww7NzaXRv?= <jose.exposito89@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        llvm@lists.linux.dev
Subject: Re: linux-next: manual merge of the drm-misc tree with the origin
 tree
Message-ID: <20221118092020.nhvjomvwwryb7j3n@houat>
References: <20221116105702.746ce3cf@canb.auug.org.au>
 <Y3ZvffZiR+SgtY6h@dev-arch.thelio-3990X>
 <20221118090636.00bfc293@canb.auug.org.au>
 <Y3bLRLDCrd7KYqom@dev-arch.thelio-3990X>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="utkgyjtezkaepsh6"
Content-Disposition: inline
In-Reply-To: <Y3bLRLDCrd7KYqom@dev-arch.thelio-3990X>
Precedence: bulk


--utkgyjtezkaepsh6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Nov 17, 2022 at 05:01:08PM -0700, Nathan Chancellor wrote:
> On Fri, Nov 18, 2022 at 09:06:36AM +1100, Stephen Rothwell wrote:
> > Hi Nathan,
> >=20
> > On Thu, 17 Nov 2022 10:29:33 -0700 Nathan Chancellor <nathan@kernel.org=
> wrote:
> > >
> > > This resolution is not quite right, as pointed out by clang:
> > >=20
> > >     drivers/gpu/drm/vc4/vc4_hdmi.c:351:14: error: variable 'vc4_hdmi'=
 is uninitialized when used here [-Werror,-Wuninitialized]
> > >             mutex_lock(&vc4_hdmi->mutex);
> > >                         ^~~~~~~~
> > >     ./include/linux/mutex.h:187:44: note: expanded from macro 'mutex_=
lock'
> > >     #define mutex_lock(lock) mutex_lock_nested(lock, 0)
> > >                                                ^~~~
> > >     drivers/gpu/drm/vc4/vc4_hdmi.c:322:27: note: initialize the varia=
ble 'vc4_hdmi' to silence this warning
> > >             struct vc4_hdmi *vc4_hdmi;
> > >                                      ^
> > >                                       =3D NULL
> > >     1 error generated.
> > >=20
> > > Obviously, the assignment of vc4_hdmi should be before mutex_lock().
> >=20
> > Thanks for pointing that out (silly me :-) ).  I have fixed up the
> > resolution for today.
>=20
> Great, thank you so much! One less warning to worry about :)

I actually did the same conflict resolution in drm-tip. I've fixed it up
too, thanks for your report :)

Maxime

--utkgyjtezkaepsh6
Content-Type: application/pgp-signature; name="signature.asc"

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

iHUEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCY3dOVAAKCRDj7w1vZxhR
xa2fAQD933QJY5E3XRwJGvMvYIALowd4qIYtQyxBCrk/Zo2bTQEAiLYk8Ij68h6E
CzpNCMHNSYp+43IPN7VzU0UqzQpvawk=
=GyeM
-----END PGP SIGNATURE-----

--utkgyjtezkaepsh6--