From mboxrd@z Thu Jan 1 00:00:00 1970 From: Salil Mehta Subject: RE: [PATCH for-next 0/2] {IB,net}/hns: Add support of ACPI to the Hisilicon RoCE Driver Date: Mon, 5 Sep 2016 12:53:07 +0000 Message-ID: References: <1471985090-202472-1-git-send-email-salil.mehta@huawei.com> <20160824.215341.1803699371957253329.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT Return-path: In-Reply-To: Content-Language: en-US Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Doug Ledford , David Miller Cc: "Huwei (Xavier)" , oulijun , "Zhuangyuzeng (Yisen)" , "mehta.salil.lnk-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" , "linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Linuxarm List-Id: linux-rdma@vger.kernel.org > -----Original Message----- > From: Doug Ledford [mailto:dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org] > Sent: Thursday, August 25, 2016 12:57 PM > To: David Miller; Salil Mehta > Cc: Huwei (Xavier); oulijun; Zhuangyuzeng (Yisen); > mehta.salil.lnk-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org; linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; > netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Linuxarm > Subject: Re: [PATCH for-next 0/2] {IB,net}/hns: Add support of ACPI to > the Hisilicon RoCE Driver > > On 8/25/2016 12:53 AM, David Miller wrote: > > From: Salil Mehta > > Date: Wed, 24 Aug 2016 04:44:48 +0800 > > > >> This patch is meant to add support of ACPI to the Hisilicon RoCE > driver. > >> Following changes have been made in the driver(s): > >> > >> Patch 1/2: HNS Ethernet Driver: changes to support ACPI have been > done in > >> the RoCE reset function part of the HNS ethernet driver. Earlier > it only > >> supported DT/syscon. > >> > >> Patch 2/2. HNS RoCE driver: changes done in RoCE driver are meant to > detect > >> the type and then either use DT specific or ACPI spcific > functions. Where > >> ever possible, this patch tries to make use of "Unified Device > Property > >> Interface" APIs to support both DT and ACPI through single > interface. > >> > >> NOTE 1: ACPI changes done in both of the drivers depend upon the > ACPI Table > >> (DSDT and IORT tables) changes part of UEFI/BIOS. These changes > are NOT > >> part of this patch-set. > >> NOTE 2: Reset function in Patch 1/2 depends upon the reset function > added in > >> ACPI tables(basically DSDT table) part of the UEFI/BIOS. Again, > this > >> change is NOT reflected in this patch-set. > > > > I can't apply this series to my tree because the hns infiniband > driver > > doesn't exist in it. > > > > No. This probably needs to go through my tree. Although with all of > the requirements, I'm a bit concerned about those being present > elsewhere. > Hi David, 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! Best regards Salil > -- > Doug Ledford > GPG Key ID: 0E572FDD -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932620AbcIEMxb convert rfc822-to-8bit (ORCPT ); Mon, 5 Sep 2016 08:53:31 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:3368 "EHLO lhrrgout.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932119AbcIEMx0 (ORCPT ); Mon, 5 Sep 2016 08:53:26 -0400 From: Salil Mehta To: Doug Ledford , David Miller CC: "Huwei (Xavier)" , oulijun , "Zhuangyuzeng (Yisen)" , "mehta.salil.lnk@gmail.com" , "linux-rdma@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Linuxarm Subject: RE: [PATCH for-next 0/2] {IB,net}/hns: Add support of ACPI to the Hisilicon RoCE Driver Thread-Topic: [PATCH for-next 0/2] {IB,net}/hns: Add support of ACPI to the Hisilicon RoCE Driver Thread-Index: AQHR/Xy6N/8zdvPUkUiv0i2wCAheAqBZDY+AgAB2R4CAEWVugA== Date: Mon, 5 Sep 2016 12:53:07 +0000 Message-ID: References: <1471985090-202472-1-git-send-email-salil.mehta@huawei.com> <20160824.215341.1803699371957253329.davem@davemloft.net> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.203.181.155] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.57CD6ABD.01E7,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 001cba82411db575c0d69bd0b93e51ae Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: Doug Ledford [mailto:dledford@redhat.com] > Sent: Thursday, August 25, 2016 12:57 PM > To: David Miller; Salil Mehta > Cc: Huwei (Xavier); oulijun; Zhuangyuzeng (Yisen); > mehta.salil.lnk@gmail.com; linux-rdma@vger.kernel.org; > netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Linuxarm > Subject: Re: [PATCH for-next 0/2] {IB,net}/hns: Add support of ACPI to > the Hisilicon RoCE Driver > > On 8/25/2016 12:53 AM, David Miller wrote: > > From: Salil Mehta > > Date: Wed, 24 Aug 2016 04:44:48 +0800 > > > >> This patch is meant to add support of ACPI to the Hisilicon RoCE > driver. > >> Following changes have been made in the driver(s): > >> > >> Patch 1/2: HNS Ethernet Driver: changes to support ACPI have been > done in > >> the RoCE reset function part of the HNS ethernet driver. Earlier > it only > >> supported DT/syscon. > >> > >> Patch 2/2. HNS RoCE driver: changes done in RoCE driver are meant to > detect > >> the type and then either use DT specific or ACPI spcific > functions. Where > >> ever possible, this patch tries to make use of "Unified Device > Property > >> Interface" APIs to support both DT and ACPI through single > interface. > >> > >> NOTE 1: ACPI changes done in both of the drivers depend upon the > ACPI Table > >> (DSDT and IORT tables) changes part of UEFI/BIOS. These changes > are NOT > >> part of this patch-set. > >> NOTE 2: Reset function in Patch 1/2 depends upon the reset function > added in > >> ACPI tables(basically DSDT table) part of the UEFI/BIOS. Again, > this > >> change is NOT reflected in this patch-set. > > > > I can't apply this series to my tree because the hns infiniband > driver > > doesn't exist in it. > > > > No. This probably needs to go through my tree. Although with all of > the requirements, I'm a bit concerned about those being present > elsewhere. > Hi David, 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! Best regards Salil > -- > Doug Ledford > GPG Key ID: 0E572FDD