Messages in this thread | | | Date | Mon, 05 Sep 2016 12:41:37 -0700 (PDT) | Subject | Re: [PATCH for-next 0/2] {IB,net}/hns: Add support of ACPI to the Hisilicon RoCE Driver | From | David Miller <> |
| |
From: Salil Mehta <salil.mehta@huawei.com> Date: Mon, 5 Sep 2016 12:53:07 +0000
> There is a patch in net-next for HNS Ethernet driver which has been accepted. > "b3dc935 net: hns: remove redundant dev_err call in hns_dsaf_get_cfg()" > > This patch is creating conflict with Doug Ledford's hns-roce branch. Internally, > We have decided to let all the HNS patches pass through the hns-roce for 4.9 > Merge window to facilitate non-conflict merge of pending RoCE driver by Doug Ledford. > > Though, we are trying to take a grip of the process for this merge window but > Somehow this one bypassed the internal process. This will create problems for > Hns-roce during merge later this window. Can I request you to drop this patch > For now. We shall re-submit this patch later when things have been settled at > the RoCE/RDMA end or would come again to you through hns-roce branch. > > Please let me know if this is possible this time. Thanks in anticipation!
This cannot work like this.
If I see an obvious fix to something in networking, I will apply the patch.
Merge conflicts happen and they have to be resolved.
We don't just revert legitimate changes to eliminate the conflict.
| |