From patchwork Thu May 19 01:58:37 2022
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: 12854453
X-Patchwork-Delegate: kuba@kernel.org
Return-Path: <netdev-owner@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 3E7B4C433F5
	for <netdev@archiver.kernel.org>; Thu, 19 May 2022 01:58:43 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231563AbiESB6l (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Wed, 18 May 2022 21:58:41 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36772 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229702AbiESB6l (ORCPT
        <rfc822;netdev@vger.kernel.org>); Wed, 18 May 2022 21:58:41 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CD62D413A;
        Wed, 18 May 2022 18:58:40 -0700 (PDT)
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 4L3Y1B2zjtz4xXk;
        Thu, 19 May 2022 11:58:37 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1652925518;
        bh=Xw76F4P8i2rMVvKg6i2Qurks8SCLOUckM1T1wqdLhDg=;
        h=Date:From:To:Cc:Subject:From;
        b=J+5Vlu5KfkB5IKUYXcsTgOrHFiYSvY4IGIrT6MEcfs++zHGYkFNb74tyevuQNsu6v
         W3v/jbl3bMixwal7FtokLT9azhuOQKPPm5CRdzZjhzubMXZG0Qyn4MlamPAYxQwe+e
         3aIgpjT0Nr8V0y8ypl2Yxx3XeSCkOXbxOP9pV+EUHB88p2xOvZImzW7K7S0nvli28d
         WumdzkxPdvkN0y1qGavt6R9TFDV4lFTzK+6QZaA+skDJXfPFIc3/WIW3IhsbHqaAyT
         KZkhSgdbYqFUUdPxJRIPlmIoO6pYEANHa0ihyu9t7LYtp95hm5YLqvX4d2/8IkFZKT
         1MYN9ih6fkfyg==
Date: Thu, 19 May 2022 11:58:37 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: Networking <netdev@vger.kernel.org>,
        Geliang Tang <geliang.tang@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20220519115837.380bb8d4@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/mptcp/subflow.c

between commit:

  ae66fb2ba6c3 ("mptcp: Do TCP fallback on early DSS checksum failure")

from the net tree and commits:

  0348c690ed37 ("mptcp: add the fallback check")
  f8d4bcacff3b ("mptcp: infinite mapping receiving")

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/mptcp/subflow.c
index be76ada89d96,6d59336a8e1e..000000000000
--- a/net/mptcp/subflow.c