From patchwork Fri Feb 12 01:44:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12084613 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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 591C7C433E0 for ; Fri, 12 Feb 2021 01:45:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FB9164E3B for ; Fri, 12 Feb 2021 01:45:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229895AbhBLBpo (ORCPT ); Thu, 11 Feb 2021 20:45:44 -0500 Received: from ozlabs.org ([203.11.71.1]:44251 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbhBLBpm (ORCPT ); Thu, 11 Feb 2021 20:45:42 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4DcGXC2SMFz9sCD; Fri, 12 Feb 2021 12:44:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1613094299; bh=JZa0GbZBzrmj0j7yTVtgKU0e3zwCa5BJ1ExITG7fqeI=; h=Date:From:To:Cc:Subject:From; b=ZbuLMNQuI1Ts0Gdo9LLv0joW2MGHLGNwO7QBwg23+snFqen1fbspnkGEM6Z1RLLBB 5WlwfvYAxi6ejWCfVhn9KTwc761fMdyba1NhsboQKSt/YgyUmfBOtc5Pa1fPt5GFv+ zII3taZDKBIcCEvaBVJqTwv+X5uPv5FIPd2evNKXn/Q0HC8TFIt9CF8ugYTnrh8EaS IGoaPToejRyP/ZsFC/O7TWQew5AMtoFdY6kIEQUQ8VjPWEpa81ikhzf7h06Ka5gqjK 75aal0ZK4MimBUsXWCpO6s3UGzpBeTmSGVat4dHmVMTZKjCiIF+hJHsbAK/wHxUncI pRkhA2QzoS9bA== Date: Fri, 12 Feb 2021 12:44:58 +1100 From: Stephen Rothwell To: David Miller , Networking Cc: Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List , Paul Blakey , wenxu Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20210212124458.3d008bb5@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/uapi/linux/pkt_cls.h between commit: 1bcc51ac0731 ("net/sched: cls_flower: Reject invalid ct_state flags rules") from the net tree and commits: 7baf2429a1a9 ("net/sched: cls_flower add CT_FLAGS_INVALID flag support") 8c85d18ce647 ("net/sched: cls_flower: Add match on the ct_state reply flag") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc include/uapi/linux/pkt_cls.h index 88f4bf0047e7,afe6836e44b1..000000000000 --- a/include/uapi/linux/pkt_cls.h