From patchwork Fri Jan 27 01:50:52 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 13118121
Return-Path: <netdev-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id CDD4CC05027
	for <netdev@archiver.kernel.org>; Fri, 27 Jan 2023 01:57:13 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S233597AbjA0B5M (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Thu, 26 Jan 2023 20:57:12 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39574 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S233615AbjA0B46 (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 26 Jan 2023 20:56:58 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D05E27A4B4;
        Thu, 26 Jan 2023 17:51:01 -0800 (PST)
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 4P30sT4Kr2z4xyB;
        Fri, 27 Jan 2023 12:50:53 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1674784255;
        bh=VNMdS/CiloN9PaF8wxKbbGy+XMCZPUIYeLlMZIhbur4=;
        h=Date:From:To:Cc:Subject:From;
        b=HA2iypQAyHfpo1GP/aSTqG9JGfMwOWPqiY4Fj2kWrHEC/KuBvgi2XZv9mVkmWDAlb
         CUcrZ2NG+F/vV9ccVH6KbOkyiZq6oTlj2Z2b0B2kJGOTppuzTLL7U3E4OR9UXuM9jx
         LQZC2yXd48NIR9GuXTnd8qafZyIYYj306pQXzsNbUPPnUeR4W8MqRtD3ju7XOC0kiY
         LfKMk37a3jXi7gqJAPDvC2NxyCVrHZDNX6JnqZ4DKRj+An0rxSFLmyg8kOOOcfLpHE
         8FPF24V2UFQlT2tiFG1FN+P4yLcZs50+1VSzYXETxu37fYrTgcXKjeP/uEpoYExckC
         jF2PlO+2B3/gQ==
Date: Fri, 27 Jan 2023 12:50:52 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Pablo Neira Ayuso <pablo@netfilter.org>,
        Sriram Yagnaraman <sriram.yagnaraman@est.tech>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20230127125052.674281f9@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/netfilter/nf_conntrack_proto_sctp.c

between commits:

  13bd9b31a969 ("Revert "netfilter: conntrack: add sctp DATA_SENT state"")
  a44b7651489f ("netfilter: conntrack: unify established states for SCTP paths")

from the net tree and commit:

  f71cb8f45d09 ("netfilter: conntrack: sctp: use nf log infrastructure for invalid packets")

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 net/netfilter/nf_conntrack_proto_sctp.c
index 945dd40e7077,dbdfcc6cd2aa..000000000000
--- a/net/netfilter/nf_conntrack_proto_sctp.c