From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jiri Pirko <jiri@resnulli.us>
Subject: Re: net-next MERGE
Date: Thu, 2 Nov 2017 21:52:43 +0100
Message-ID: <20171102205243.GC2024@nanopsycho>
References: <20171102.155132.1655653462204756563.davem@davemloft.net>
 <CAM_iQpVS1C45_8zA6Qbke562ASrkCEgD1jzhachZwssCzejRmg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: David Miller <davem@davemloft.net>,
        Linux Kernel Network Developers <netdev@vger.kernel.org>
To: Cong Wang <xiyou.wangcong@gmail.com>
Return-path: <netdev-owner@vger.kernel.org>
Received: from mail-wr0-f177.google.com ([209.85.128.177]:43551 "EHLO
        mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S932173AbdKBUwp (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 2 Nov 2017 16:52:45 -0400
Received: by mail-wr0-f177.google.com with SMTP id w105so768507wrc.0
        for <netdev@vger.kernel.org>; Thu, 02 Nov 2017 13:52:45 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <CAM_iQpVS1C45_8zA6Qbke562ASrkCEgD1jzhachZwssCzejRmg@mail.gmail.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

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.