From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E95FC43381 for ; Fri, 15 Feb 2019 20:41:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D17C621924 for ; Fri, 15 Feb 2019 20:41:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390649AbfBOUl2 (ORCPT ); Fri, 15 Feb 2019 15:41:28 -0500 Received: from shards.monkeyblade.net ([23.128.96.9]:45422 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727198AbfBOUl2 (ORCPT ); Fri, 15 Feb 2019 15:41:28 -0500 Received: from localhost (unknown [IPv6:2601:601:9f80:35cd::bf5]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id D8E3014F0BB4E; Fri, 15 Feb 2019 12:41:27 -0800 (PST) Date: Fri, 15 Feb 2019 12:41:25 -0800 (PST) Message-Id: <20190215.124125.1781326145216021027.davem@davemloft.net> To: netdev@vger.kernel.org CC: xiyou.wangcong@gmail.com, vladbu@mellanox.com Subject: [MERGE HELP] cls_tcindex.c From: David Miller X-Mailer: Mew version 6.8 on Emacs 26.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Fri, 15 Feb 2019 12:41:28 -0800 (PST) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I've merged net into net-next. The worst conflict was cls_tcindex.c as Cong's fixes collided heavily with Vlad's work. The interim solution I used for this merge was to revert back to RCU. Please take a look at what I did and send me followups because I am absolutely certain that some are necessary :-))) Thanks!