Hi Stephen,
On Mon, 2019-04-29 at 11:54 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
>
> between commits:
>
> 154d4899e411 ("iwlwifi: mvm: properly check debugfs dentry before using it")
> d156e67d3f58 ("iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register()")
>
> from the wireless-drivers tree and commit:
>
> c9af7528c331 ("iwlwifi: mvm: no need to check return value of debugfs_create functions")
>
> from the net-next tree.
>
> I fixed it up (the latter removed the code modified by the former, so I
> just did that) 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.
I checked your merge and it looks good, thanks!
--
Cheers,
Luca.
