Received-SPF: pass (google.com: domain of linux-kernel+bounces-156346-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 24 Apr 2024 16:12:02 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: Fabio Estevam <festevam@denx.de>, Javier Carrasco
 <javier.carrasco@wolfvision.net>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current
 tree
Message-ID: <20240424161202.7e45e19e@canb.auug.org.au>
In-Reply-To: <2024041230-slaw-subsiding-9e85@gregkh>
References: <20240412142547.3598ff68@canb.auug.org.au>
	<2024041230-slaw-subsiding-9e85@gregkh>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/0xI_=SLPommwheHLLKfHSDi";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi Greg,

On Fri, 12 Apr 2024 09:58:52 +0200 Greg KH <greg@kroah.com> wrote:
>
> On Fri, Apr 12, 2024 at 02:25:47PM +1000, Stephen Rothwell wrote:
> >=20
> > Today's linux-next merge of the usb tree got a conflict in:
> >=20
> >   drivers/usb/misc/onboard_usb_hub.c
> >=20
> > between commit:
> >=20
> >   34b990e9bb54 ("usb: misc: onboard_usb_hub: Disable the USB hub clock =
on failure")
> >=20
> > from the usb.current tree and commit:
> >=20
> >   31e7f6c015d9 ("usb: misc: onboard_hub: rename to onboard_dev")
> >=20
> > from the usb tree.
> >=20
> > I fixed it up (I deleted this file and applied the following patch) 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
>=20
> Thanks, I knew this would happen, I'll apply your fixup when merging the
> two branches together.

It looks like the fix up patch did not get applied (repeated below).

--=20
Cheers,
Stephen Rothwell

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 12 Apr 2024 14:20:48 +1000
Subject: [PATCH] fix up for "usb: misc: onboard_hub: rename to onboard_dev"

interacting with "usb: misc: onboard_usb_hub: Disable the USB hub clock
on failure"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/usb/misc/onboard_usb_dev.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/misc/onboard_usb_dev.c b/drivers/usb/misc/onboard_=
usb_dev.c
index 648ea933bdad..f2bcc1a8b95f 100644
--- a/drivers/usb/misc/onboard_usb_dev.c
+++ b/drivers/usb/misc/onboard_usb_dev.c
@@ -93,7 +93,7 @@ static int onboard_dev_power_on(struct onboard_dev *onboa=
rd_dev)
 	if (err) {
 		dev_err(onboard_dev->dev, "failed to enable supplies: %pe\n",
 			ERR_PTR(err));
-		return err;
+		goto disable_clk;
 	}
=20
 	fsleep(onboard_dev->pdata->reset_us);
@@ -102,6 +102,10 @@ static int onboard_dev_power_on(struct onboard_dev *on=
board_dev)
 	onboard_dev->is_powered_on =3D true;
=20
 	return 0;
+
+disable_clk:
+	clk_disable_unprepare(onboard_dev->clk);
+	return err;
 }
=20
 static int onboard_dev_power_off(struct onboard_dev *onboard_dev)
--=20
2.43.0


--Sig_/0xI_=SLPommwheHLLKfHSDi
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYoorIACgkQAVBC80lX
0Gx8nwf+Ky1H4cJiZmlF6KmnzitTA7p+81Gssp+3gCMJn0rsO0we+aMNsYI86roh
SJCwDscx1enNllif/xoPVG63aoLRbOWPWkLAYgsH0m0tItSneUOykxV3ltTriDMk
KcTDP9dwLxeNE5t+WCA+4jG6qYi2krbo1wNH81K8f2wfuqIebqWT28WYAuEBKJbm
pHSkU8JlZBlxjUEfTfXoSkbOzZHuiadxtmASfA8hOgMgEQo0eIrWHE34KOgxH7Sq
FJrYt8833Os8OfvGxLjlB+vwdqLSknAehA7VTcxZtHNxbOtwF82wsQrlW6OtDk5J
TUELCJRbD0EV+eXTgAws10OJv2mdpA==
=8vas
-----END PGP SIGNATURE-----

--Sig_/0xI_=SLPommwheHLLKfHSDi--