> -----Original Message----- > From: David Miller [mailto:da...@davemloft.net] > Sent: Wednesday, August 24, 2016 1:19 AM > To: weiyj...@gmail.com > Cc: Zhuangyuzeng (Yisen); Salil Mehta; huangdaode; Yankejian (Hackim > Yim); xieqianqian; weiyongjun (A); netdev@vger.kernel.org > Subject: Re: [PATCH -next] net: hns: remove redundant dev_err call in > hns_dsaf_get_cfg() > > From: Wei Yongjun <weiyj...@gmail.com> > Date: Tue, 23 Aug 2016 15:11:03 +0000 > > > From: Wei Yongjun <weiyongj...@huawei.com> > > > > There is a error message within devm_ioremap_resource > > already, so remove the dev_err call to avoid redundant > > error message. > > > > Signed-off-by: Wei Yongjun <weiyongj...@huawei.com> > > Applied. Hi David, Forgive me for acting late on this but just realized that 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. RoCE base driver has already suffered because of such problem during earlier merge window.
Can I request you to drop this patch for now? We shall submit this patch later again either through hns-roce or directly to net-next. Thanks in anticipation Salil
