> -----Original Message----- > From: Doug Ledford [mailto:dledf...@redhat.com] > Sent: Thursday, August 25, 2016 12:57 PM > To: David Miller; Salil Mehta > Cc: Huwei (Xavier); oulijun; Zhuangyuzeng (Yisen); > mehta.salil....@gmail.com; linux-r...@vger.kernel.org; > netdev@vger.kernel.org; linux-ker...@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 <salil.me...@huawei.com> > > 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 <dledf...@redhat.com> > GPG Key ID: 0E572FDD
