From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: net-next MERGE
Date: Thu, 02 Nov 2017 15:51:32 +0900 (KST)
Message-ID: <20171102.155132.1655653462204756563.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org
To: xiyou.wangcong@gmail.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:43746 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751321AbdKBGvf (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 2 Nov 2017 02:51:35 -0400
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


Cong, I just did another net --> net-next merge.

Please look at how I resolved the cls_api.c conflict.

Thank you.