From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: More painful merges...
Date: Mon, 30 Oct 2017 21:15:51 +0900 (KST)
Message-ID: <20171030.211551.790664985307439262.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: john.fastabend@gmail.com, ast@kernel.org, daniel@iogearbox.net,
        xiyou.wangcong@gmail.com, jiri@mellanox.com
To: netdev@vger.kernel.org
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:36576 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753057AbdJ3MP7 (ORCPT
        <rfc822;netdev@vger.kernel.org>); Mon, 30 Oct 2017 08:15:59 -0400
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


BPF and tc action bug fixes in 'net' caused some extremely
painful merges with 'net-next'.

Could the interested parties please take a look at 'net-next'
and send me any necessary fixes, as I did the best that I
could.

Thank you.