> -----Original Message-----
> From: David Miller [mailto:[email protected]]
> Sent: Monday, September 05, 2016 8:43 PM
> To: Salil Mehta
> Cc: [email protected]; Zhuangyuzeng (Yisen); Yankejian (Hackim Yim);
> [email protected]; [email protected]
> Subject: Re: [PATCH -next v2] net: hns: fix return value check in
> hns_dsaf_get_cfg()
>
> From: Salil Mehta <[email protected]>
> 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.
