From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: net merged into net-next
Date: Fri, 19 Jan 2018 23:02:33 -0500 (EST)
Message-ID: <20180119.230233.543013153745056133.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: xiyou.wangcong@gmail.com
To: netdev@vger.kernel.org
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:52066 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753011AbeATECf (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 19 Jan 2018 23:02:35 -0500
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


Cong, please check my conflict resolution of drivers/net/tun.c, thank
you.