linux-next: manual merge of the thunderbolt tree with the thunderbolt-fixes tree

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

Hi all,

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

  drivers/thunderbolt/nhi.c

between commit:

  c35c173c3daa0 ("thunderbolt: Initialize ->domain_released completion befo=
re it is being used")

=66rom the thunderbolt-fixes tree and commit:

  5f40cba7d4fa3 ("thunderbolt: Assert downstream port reset on shutdown")

=66rom the thunderbolt tree.

I fixed it up (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.

diff --cc drivers/thunderbolt/nhi.c
index 35e3c119d5ee8,698fb124d5291..0000000000000
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@@ -1235,6 -1233,10 +1235,8 @@@ int nhi_probe(struct tb_nhi *nhi
 =20
  	dev_dbg(dev, "NHI initialized, starting thunderbolt\n");
 =20
 -	init_completion(&nhi->domain_released);
 -
+ 	nhi->host_reset =3D host_reset;
+=20
  	res =3D tb_domain_add(tb, host_reset);
  	if (res) {
  		/*

--EVwFTe4orBr+x9Po
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpqC7UACgkQJNaLcl1U
h9Ci9Qf/dBuOWUa6tBg6JtvSGjYKp9JdDPd16jBm5RwafQfcjzsABy+tgxAkWVLJ
Nscg6lI94Xl3cpFpjPKwTpL/F07L3Kt7yxVeKrSUOLCas57yczI8dsywf8EXzlVo
IjmQPjV91uxrRd9yz2Kl/83XCRLZclK6QoiNkq3KN2dwWEFhimzlDpWWYVL6Cqu9
RHDZv6m1Z8Bozl6PwMu2fCBbptbFDfjNrKtAM4dn7dszvk9RI1eX/1AGXsMnNmlJ
4rWXCMOo7UOMzcRUoX3WK8aFjS/O8UIQdpbAHkRWxUj3MUgqmGEp/IBmsUKZt56x
z0V6TG4k75Vbs8f7iSRfTHcXAqGWhA==
=+XR5
-----END PGP SIGNATURE-----

--EVwFTe4orBr+x9Po--