From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755123AbcIETlp (ORCPT ); Mon, 5 Sep 2016 15:41:45 -0400 Received: from shards.monkeyblade.net ([184.105.139.130]:58224 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754360AbcIETln (ORCPT ); Mon, 5 Sep 2016 15:41:43 -0400 Date: Mon, 05 Sep 2016 12:41:37 -0700 (PDT) Message-Id: <20160905.124137.1197811755644672169.davem@davemloft.net> To: salil.mehta@huawei.com Cc: dledford@redhat.com, xavier.huwei@huawei.com, oulijun@huawei.com, yisen.zhuang@huawei.com, mehta.salil.lnk@gmail.com, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linuxarm@huawei.com Subject: Re: [PATCH for-next 0/2] {IB,net}/hns: Add support of ACPI to the Hisilicon RoCE Driver From: David Miller In-Reply-To: References: <20160824.215341.1803699371957253329.davem@davemloft.net> X-Mailer: Mew version 6.7 on Emacs 24.5 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Mon, 05 Sep 2016 12:41:40 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Salil Mehta 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.