From patchwork Thu Oct 1 03:49:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1374815 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=UtU8xdkY; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C1zf11m4hz9sVK for ; Thu, 1 Oct 2020 13:49:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730501AbgJADtm (ORCPT ); Wed, 30 Sep 2020 23:49:42 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:43343 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725800AbgJADtl (ORCPT ); Wed, 30 Sep 2020 23:49:41 -0400 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 4C1zds39sxz9sTs; Thu, 1 Oct 2020 13:49:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1601524178; bh=AGb82oIvilqjQ4RyNnBQ/75lbtR5jPycsZgAXY7Q+34=; h=Date:From:To:Cc:Subject:From; b=UtU8xdkY5NlpcxFYCuarMPxhXkiFfTG9+DXck2lCM3mhnIFGj50aew7QStrbNtITe /uSw3+Xln/gpfKSaQ+kV1VsIVkYsoQNe00buHhySC/wu9FucUzc76QEKKH6KLgco4F NUVgF2ly/ehjsF5+i2IBU0C2zGLpMa0N1HM3gTBnMi73ceaOs5YXwsV/qktlnLmTek pTW1LT3QRvpcSnJfPTSV2HkR1/zFXCanWjrnbzmfwvuqUDr9ZDdyMhJEDIDfzPG/U+ AV2bH6R9X1NyYGDpabme5rDCPG6hw4rRPzFAdvQoMpj7CkTWJerjyA6Jao2c+lfsxx FnPioZRQIbw4g== Date: Thu, 1 Oct 2020 13:49:36 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Mat Martineau , Paolo Abeni Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20201001134936.305b51c6@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: net/mptcp/protocol.c between commit: 917944da3bfc ("mptcp: Consistently use READ_ONCE/WRITE_ONCE with msk->ack_seq") from the net tree and commit: 8268ed4c9d19 ("mptcp: introduce and use mptcp_try_coalesce()") ab174ad8ef76 ("mptcp: move ooo skbs into msk out of order queue.") from the net-next tree. I fixed it up (I think - 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/protocol.c index 5d747c6a610e,34c037731f35..000000000000 --- a/net/mptcp/protocol.c