From: Salil Mehta <salil.me...@huawei.com> Date: Mon, 5 Sep 2016 14:20:33 +0000
> This patch will conflict with Doug Ledford's hns-roce's HNS driver. > This might lead to problems later during this merge window of 4.9. You don't need to say this three times. These changes will not be reverted, instead the conflicts will need to simply be resolved during the merges just like any other conflict that ever happens in our trees.
