From: Kalle Valo <kvalo@xxxxxxxxxxxxxx> Date: Tue, 30 Apr 2019 18:10:01 +0300 > here's one more pull request to net tree for 5.1, more info below. > > Also note that this pull conflicts with net-next. And I want to emphasie > that it's really net-next, so when you pull this to net tree it should > go without conflicts. Stephen reported the conflict here: > > https://lkml.kernel.org/r/20190429115338.5decb50b@xxxxxxxxxxxxxxxx > > In iwlwifi oddly commit 154d4899e411 adds the IS_ERR_OR_NULL() in > wireless-drivers but commit c9af7528c331 removes the whole check in > wireless-drivers-next. The fix is easy, just drop the whole check for > mvmvif->dbgfs_dir in iwlwifi/mvm/debugfs-vif.c, it's unneeded anyway. > > As usual, please let me know if you have any problems. Pulled, thanks Kalle. Thanks for the conflict resolution information, it is very helpful. However, can you put it into the merge commit text next time as well? I cut and pasted it in there when I pulled this stuff in. Thanks!
