[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <F4CC6FACFEB3C54C9141D49AD221F7F91A6FAE20@lhreml503-mbx>
Date: Tue, 6 Sep 2016 08:42:25 +0000
From: Salil Mehta <salil.mehta@...wei.com>
To: David Miller <davem@...emloft.net>
CC: "weiyj_lk@....com" <weiyj_lk@....com>,
"Zhuangyuzeng (Yisen)" <yisen.zhuang@...wei.com>,
"Yankejian (Hackim Yim)" <yankejian@...wei.com>,
"yongjun_wei@...ndmicro.com.cn" <yongjun_wei@...ndmicro.com.cn>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: RE: [PATCH -next v2] net: hns: fix return value check in
hns_dsaf_get_cfg()
> -----Original Message-----
> From: David Miller [mailto:davem@...emloft.net]
> Sent: Monday, September 05, 2016 8:43 PM
> To: Salil Mehta
> Cc: weiyj_lk@....com; Zhuangyuzeng (Yisen); Yankejian (Hackim Yim);
> yongjun_wei@...ndmicro.com.cn; netdev@...r.kernel.org
> Subject: Re: [PATCH -next v2] net: hns: fix return value check in
> hns_dsaf_get_cfg()
>
> From: Salil Mehta <salil.mehta@...wei.com>
> Date: Mon, 5 Sep 2016 14:20:33 +0000
>
> > 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.
>
> You don't need to say this three times.
Sorry about this
>
> These changes will not be reverted, instead the conflicts will need
> to simply be resolved during the merges just like any other conflict
> that ever happens in our trees.
Fine, got your point.
Powered by blists - more mailing lists