[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20160905.124313.2033920102101765222.davem@davemloft.net>
Date: Mon, 05 Sep 2016 12:43:13 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: salil.mehta@...wei.com
Cc: weiyj_lk@....com, yisen.zhuang@...wei.com, yankejian@...wei.com,
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.
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.
Powered by blists - more mailing lists