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

Hi all,

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

drivers/thunderbolt/property.c

between commit:

928abe19fbf01 ("thunderbolt: property: Cap recursion depth in __tb_property_parse_dir()")

from the thunderbolt-fixes tree and commit:

7e6445d9d6f7d ("thunderbolt: Add tb_property_merge_dir()")

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/property.c
index da2c59a17db5c,6b9666b611818..0000000000000
@@@ -39,7 -37,8 +39,8 @@@ struct tb_property_dir_entry 
  
  static struct tb_property_dir *__tb_property_parse_dir(const u32 *block,
  	size_t block_len, unsigned int dir_offset, size_t dir_len,
 -	bool is_root);
 +	bool is_root, unsigned int depth);
+ static struct tb_property *tb_property_copy(const struct tb_property *property);
  
  static inline void parse_dwdata(void *dst, const void *src, size_t dwords)
  {