Received-SPF: pass (google.com: domain of linux-kernel+bounces-72276-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 20 Feb 2024 14:39:19 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Heikki Krogerus
 <heikki.krogerus@linux.intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Xu Yang <xu.yang_2@nxp.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree
Message-ID: <20240220143919.40257e7b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/vjSNruKW=5aAeRpaXByyGmo";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/roles/class.c

between commit:

  b787a3e78175 ("usb: roles: don't get/set_role() when usb_role_switch is u=
nregistered")

from the usb.current tree and commit:

  9a270ec7bfb0 ("usb: roles: Link the switch to its connector")

from the usb tree.

I fixed it up (I think - see below) 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

diff --cc drivers/usb/roles/class.c
index 70165dd86b5d,4ad03c93c17f..000000000000
--- a/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@@ -361,8 -379,12 +388,14 @@@ usb_role_switch_register(struct device=20
  		return ERR_PTR(ret);
  	}
 =20
+ 	if (dev_fwnode(&sw->dev)) {
+ 		ret =3D component_add(&sw->dev, &connector_ops);
+ 		if (ret)
+ 			dev_warn(&sw->dev, "failed to add component\n");
+ 	}
+=20
 +	sw->registered =3D true;
 +
  	/* TODO: Symlinks for the host port and the device controller. */
 =20
  	return sw;
@@@ -377,10 -399,11 +410,12 @@@ EXPORT_SYMBOL_GPL(usb_role_switch_regis
   */
  void usb_role_switch_unregister(struct usb_role_switch *sw)
  {
- 	if (!IS_ERR_OR_NULL(sw)) {
- 		sw->registered =3D false;
- 		device_unregister(&sw->dev);
- 	}
+ 	if (IS_ERR_OR_NULL(sw))
+ 		return;
++	sw->registered =3D false;
+ 	if (dev_fwnode(&sw->dev))
+ 		component_del(&sw->dev, &connector_ops);
+ 	device_unregister(&sw->dev);
  }
  EXPORT_SYMBOL_GPL(usb_role_switch_unregister);
 =20

--Sig_/vjSNruKW=5aAeRpaXByyGmo
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXUHucACgkQAVBC80lX
0GynJggAgp2c1SBbsndc4wTiwdd2na4docb9SNOcYSCZaHqGzrUtJEVqhvBF0G7M
O11/zmiEjFRFluIRCuFKWvdijXPBTgjHuRf6ulLz7wYNEu/3jUmLN9RH7f30U6EI
HEqEuNF2tsZygAZC0+lVJqDqh0z1EAZnk/i3Bq5NzjmjIt9IXdurpQsyNX4iWpjD
RatLKmYTq7iSQaxQF4Jg1uvqpYUn/GExpah0wXsgWMPcvPI7/T3gsij1LlG5Vg1n
mVV939/96K5ztHkPFHtLOmvILkMJYB2LcAVNwlko3f2Tfx7VUqxu8BlpetAZw28C
Pdpe1KtKTapHMMC+g+3Qmac5cvpqFg==
=dl5s
-----END PGP SIGNATURE-----

--Sig_/vjSNruKW=5aAeRpaXByyGmo--