From: David Miller <davem@davemloft.net>
To: salil.mehta@huawei.com
Cc: weiyj_lk@163.com, yisen.zhuang@huawei.com, yankejian@huawei.com,
yongjun_wei@trendmicro.com.cn, netdev@vger.kernel.org
Subject: Re: [PATCH -next v2] net: hns: fix return value check in hns_dsaf_get_cfg()
Date: Mon, 05 Sep 2016 12:43:13 -0700 (PDT) [thread overview]
Message-ID: <20160905.124313.2033920102101765222.davem@davemloft.net> (raw)
In-Reply-To: <F4CC6FACFEB3C54C9141D49AD221F7F91A6FA0CA@lhreml503-mbx>
From: Salil Mehta <salil.mehta@huawei.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.
next prev parent reply other threads:[~2016-09-05 19:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 15:00 [PATCH -next] net: hns: fix return value check in hns_dsaf_get_cfg() weiyj_lk
2016-07-05 7:08 ` David Miller
2016-07-05 12:08 ` Sergei Shtylyov
2016-07-05 7:56 ` [PATCH -next v2] " weiyj_lk
2016-07-05 17:21 ` David Miller
2016-09-05 14:20 ` Salil Mehta
2016-09-05 19:43 ` David Miller [this message]
2016-09-06 8:42 ` Salil Mehta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160905.124313.2033920102101765222.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.com \
--cc=weiyj_lk@163.com \
--cc=yankejian@huawei.com \
--cc=yisen.zhuang@huawei.com \
--cc=yongjun_wei@trendmicro.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).