Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Date:   Fri, 20 Oct 2023 13:00:54 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dave Airlie <airlied@redhat.com>
Cc:     Daniel Vetter <daniel.vetter@ffwll.ch>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        RD Babiera <rdbabiera@google.com>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Bjorn Andersson <andersson@kernel.org>,
        Bjorn Andersson <bjorn.andersson@linaro.org>,
        Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the drm-misc tree
Message-ID: <20231020130054.7bf18733@canb.auug.org.au>
In-Reply-To: <20231012122749.45d37e52@canb.auug.org.au>
References: <20231012122209.6f2768df@canb.auug.org.au>
        <20231012122749.45d37e52@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/bRfMJxeDf2dcjzBUlx0s4+b";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Thu, 12 Oct 2023 12:27:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au=
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >=20
> > drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
> > drivers/usb/typec/altmodes/displayport.c:309:33: error: too few argumen=
ts to function 'drm_connector_oob_hotplug_event'
> >   309 |                                 drm_connector_oob_hotplug_event=
(dp->connector_fwnode);
> >       |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > In file included from drivers/usb/typec/altmodes/displayport.c:17:
> > include/drm/drm_connector.h:1984:6: note: declared here
> >  1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle *conn=
ector_fwnode,
> >       |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >=20
> > Caused by commit
> >=20
> >   fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event(=
)")
> >=20
> > interacting with commit
> >=20
> >   89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when =
exiting mode")
> >=20
> > from the usb.current tree.
> >=20
> > I have applied the following merge fix patch.
> >=20
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 12 Oct 2023 12:17:31 +1100
> > Subject: [PATCH] fix up for "drm: Add HPD state to
> >  drm_connector_oob_hotplug_event()"
> >=20
> > interacting with commit
> >=20
> >   89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when =
exiting mode")
> >=20
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/usb/typec/altmodes/displayport.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >=20
> > diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typ=
ec/altmodes/displayport.c
> > index ddfb5b6ace4f..eb0bf08fc97a 100644
> > --- a/drivers/usb/typec/altmodes/displayport.c
> > +++ b/drivers/usb/typec/altmodes/displayport.c
> > @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
> >  			dp->data.status =3D 0;
> >  			dp->data.conf =3D 0;
> >  			if (dp->hpd) {
> > -				drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > +				drm_connector_oob_hotplug_event(dp->connector_fwnode =20
>=20
> Pretend that there is a comma at the end of the above line :-)
>=20
> > +								connector_status_disconnected);
> >  				dp->hpd =3D false;
> >  				sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd");
> >  			}
> > --=20
> > 2.40.1 =20

This is now a conflict between the drm tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/bRfMJxeDf2dcjzBUlx0s4+b
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUx31YACgkQAVBC80lX
0GxSOggAg+4c30k8rAnR/50mOECdA81/fTegm0fV4grZhCiNXhWNfpQkc0ekA0S/
4FgPGCElIiWU5Kx45UefkHEnc+gPehIVstcj5jW3Bbb4kHJe3x75KHaYI08Gztq6
0bv/DrwvKz7jZotrOStwG+sVaHkNfL7xt2cNv2Kk3V01g+lQrUSdGNNlAJvLlHRH
ape0t+80oHbLiW0d5zq0uDfzhVKjzBqSYftu1dxqL38aX6X1ysH6A5zgqX41H6su
QcFyxXLvOup6RuCRxMnA/OXhbMn3I/iBhjiWMvI2r0SIhHCLsFPUk3etJUQ9v0m/
PZU7+IfwYmUnZfpHrz/rHFEKK0GlCA==
=I9HV
-----END PGP SIGNATURE-----

--Sig_/bRfMJxeDf2dcjzBUlx0s4+b--