From: Jiri Pirko <jiri@resnulli.us>
To: Cong Wang <xiyou.wangcong@gmail.com>
Cc: David Miller <davem@davemloft.net>,
Linux Kernel Network Developers <netdev@vger.kernel.org>
Subject: Re: net-next MERGE
Date: Thu, 2 Nov 2017 21:52:43 +0100 [thread overview]
Message-ID: <20171102205243.GC2024@nanopsycho> (raw)
In-Reply-To: <CAM_iQpVS1C45_8zA6Qbke562ASrkCEgD1jzhachZwssCzejRmg@mail.gmail.com>
Thu, Nov 02, 2017 at 07:08:12PM CET, xiyou.wangcong@gmail.com wrote:
>On Wed, Nov 1, 2017 at 11:51 PM, David Miller <davem@davemloft.net> wrote:
>>
>> Cong, I just did another net --> net-next merge.
>>
>> Please look at how I resolved the cls_api.c conflict.
>>
>> Thank you.
>
>Looks good to me.
Also looks fine to me.
prev parent reply other threads:[~2017-11-02 20:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 6:51 net-next MERGE David Miller
2017-11-02 18:08 ` Cong Wang
2017-11-02 20:52 ` Jiri Pirko [this message]
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=20171102205243.GC2024@nanopsycho \
--to=jiri@resnulli.us \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=xiyou.wangcong@gmail.com \
/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).