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

[Mark Brown]

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 before it is being used")

from the thunderbolt-fixes tree and commit:

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

from 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
  
  	dev_dbg(dev, "NHI initialized, starting thunderbolt\n");
  
 -	init_completion(&nhi->domain_released);
 -
+ 	nhi->host_reset = host_reset;
+ 
  	res = tb_domain_add(tb, host_reset);
  	if (res) {
  		/*

Attachment: signature.asc
Description: PGP signature