Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp7708rdg; Wed, 11 Oct 2023 18:29:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQwO1+IpJ1s8r3DcCUFy93meCSUVMy3ewCWl2ltlSnZU7lktovql1IPPi8xnQkavrnTVPj X-Received: by 2002:a17:902:9885:b0:1c6:117b:7086 with SMTP id s5-20020a170902988500b001c6117b7086mr21450715plp.5.1697074168793; Wed, 11 Oct 2023 18:29:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697074168; cv=none; d=google.com; s=arc-20160816; b=iR0FMF/O18m6m+fUzBXJTYucJuPu//9PIUMeh33G3PTyC/CmeaLqHA/F+zsi8ttXyD VzjJt9jrwkBVt7UAG49FDz/4L70zKO4qv5RZ59Gh8q/+UMSFMWdho7YZjfGTyfBZqrpR 0yb+8P04SFpReIwUQtw6mUTfyjbYIzMWNn2nwXGZ2JRQfduF6j+8QwDCgfHuRAIXmGJ3 uYp1KJtb8JoZRQVypuJEtPMFogj1x5x+9MGq8ZPA3ACbZiOaHaTaQtOa4v7ufMiOBi0d IYy2VvcmW3JIRf+s23XpV1KR0tjfoekw9gS7zLuzcepfyKGl3WTpZIsVb2eZOifEc/oz q1Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :subject:cc:to:from:date:dkim-signature; bh=J8Qnx2sCAxUCzPDNIHkIPr+OI4WaMav0iSRgTQB3ipU=; fh=+K+MbkGp43R4xlp30qy9w932e/vztNLDg7P3Rw7w/eo=; b=do/Fi4rd9MRhjmKxoldbt+hjpnpIuoAwsKeTYMnasWBXg6oUuPXg3JyTfQ9ZVRBzfs ChiYWoFPBrqE8W9dlfJRkVH109AEwRe1ZuCnBPLFNB/KAex02qVdhEkd4I14z4REU+xJ 7/bm/W1J+jdjnZxXAcnPdvYCbGxuN8f5PuEwBf44a2sixLH+qOEgmBxjD3fuw4pu0iFe mXh0D69OIZXZOzyHo9cL9KckzPC2ezTkWp4EuhPRKzm6/U3Ht1KGGM1tgsKjf/oBeJpu VH4sZv093KR5JKbualnj9KOYUPzklhHyfkic1E562Y7Dn7FpMgDi2b9yj6qJkdRVbXIJ /CSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lck2Tuaz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id j9-20020a170902da8900b001c3ea2bbebcsi981862plx.322.2023.10.11.18.29.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 18:29:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lck2Tuaz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 00603820D5FB; Wed, 11 Oct 2023 18:29:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233969AbjJLB1y (ORCPT + 99 others); Wed, 11 Oct 2023 21:27:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233269AbjJLB1x (ORCPT ); Wed, 11 Oct 2023 21:27:53 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEB2E98; Wed, 11 Oct 2023 18:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697074070; bh=J8Qnx2sCAxUCzPDNIHkIPr+OI4WaMav0iSRgTQB3ipU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=lck2TuazuWYN1RyagGvhZVEPKye8aEe20EGf6lj90LuwyXsu6wAzZhIBJcwzBoykF QNC9xmP/ROpfLTa4PN5W++QjZhIy7DSArV4alnOo7G4k8ZnK+ig2bUEjKDSA6p0WQN L7AmpbVpdz36+65RbNQ+3PKQE0UPbJKlcMuNKtR84RvhKL5g891DfdJtmZ3zjC3L5c Z/hWqsy2kk96tkO5W/j1PCpKeBjL/d03cc+bv4Qi+1yh1lajvRwH8hY9htGGDcuHhs ZN5sqeP8lHbX/boCVJ4hPELposgsIpAmvkkhbkwt22R2N6P3B12hNTh9hwnwf2lZ2W evdA0jh1U+D6w== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S5X7n6gk2z4xPY; Thu, 12 Oct 2023 12:27:49 +1100 (AEDT) Date: Thu, 12 Oct 2023 12:27:49 +1100 From: Stephen Rothwell To: Daniel Vetter Cc: Greg Kroah-Hartman , RD Babiera , Intel Graphics , DRI , Bjorn Andersson , Bjorn Andersson , Dmitry Baryshkov , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20231012122749.45d37e52@canb.auug.org.au> In-Reply-To: <20231012122209.6f2768df@canb.auug.org.au> References: <20231012122209.6f2768df@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/VHNQbpLwKeOceXrqi_0uSe6"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 11 Oct 2023 18:29:26 -0700 (PDT) X-Spam-Level: ** --Sig_/VHNQbpLwKeOceXrqi_0uSe6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell = 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 arguments= to function 'drm_connector_oob_hotplug_event' > 309 | drm_connector_oob_hotplug_event(d= p->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 *connec= tor_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 ex= iting mode") >=20 > from the usb.current tree. >=20 > I have applied the following merge fix patch. >=20 > From: Stephen Rothwell > 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 ex= iting mode") >=20 > Signed-off-by: Stephen Rothwell > --- > 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/typec= /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 Pretend that there is a comma at the end of the above line :-) > + connector_status_disconnected); > dp->hpd =3D false; > sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd"); > } > --=20 > 2.40.1 --=20 Cheers, Stephen Rothwell --Sig_/VHNQbpLwKeOceXrqi_0uSe6 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUnS5UACgkQAVBC80lX 0GwDZgf+NaN4xD1Pb86+Q0qdo86qD1QPdJ3JvRCXl4ThEjqTA4eHqE/ZA+kHiXpt ylUTlQI6D2UqLTvbG1lUTrTbhfaUA0JjkctwA4nu6VWbbZbvnUMjO/FiP0VisGys 6seAZxDIk22ejVC3hExiM/Y/EH2MsAwehpOmCXyGxQ1YOBrvMW1G59OyEuZKNRxB bGKcYO89Fvq+gs9CVGHezfCYXZOzm7yX2sPs0kQEnabKsA511+NGuBAUeqP5bsPU t9C1L3TV7uaR4qqAUUiq4PfiThICk7ZlS7ugr3ZHnZEr1rM7GYvK2Ls4/1I++/6S axHrG/X5alpWf3WJ/3tjGQrvkSV52g== =2mTb -----END PGP SIGNATURE----- --Sig_/VHNQbpLwKeOceXrqi_0uSe6--