From patchwork Thu Oct 1 03:52:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1374816 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=gM+8vo9B; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C1zjR4HLPz9sVJ for ; Thu, 1 Oct 2020 13:52:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730884AbgJADwl (ORCPT ); Wed, 30 Sep 2020 23:52:41 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:49727 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725800AbgJADwk (ORCPT ); Wed, 30 Sep 2020 23:52:40 -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 4C1zjK6tQFz9sVH; Thu, 1 Oct 2020 13:52:37 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1601524358; bh=gCAT7PYuRTzz3YkKtze9ptscMbAyN0IEBzt3bY9bTGQ=; h=Date:From:To:Cc:Subject:From; b=gM+8vo9Bznn5OC3R32jb8bpMkElXkqqvTtuV0V74b/XqSWcgMxFc/KEbEXqaj9Y7+ 0rwJuI2cWnkOHkIRF1FB/FzAeOyEeAc7mOhw46WQq/6cfA/qsJhAzosCcuUunceE27 eiAxMezNIHga2TNkzUNhYnjTfd9loBFuH0BTdHb3wbD6doknrWMA+gDhy3cAnKLh8i VadCzvWHW2CYz+ob3nfxh+VC+LK2l5JFKUZ6qY1BqsJIb/4SlBTzGmbIUevfgm/MAq /4Tjw9kapn4/n3kn/O1t9LhEfBac3J0dPcdmjB1Lx0lY4ZJP048+XqQBub70bIS/fP +UWpLSZcBHJZA== Date: Thu, 1 Oct 2020 13:52:37 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Mat Martineau , Geliang Tang Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20201001135237.6ec2468a@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.h between commit: 1a49b2c2a501 ("mptcp: Handle incoming 32-bit DATA_FIN values") from the net tree and commit: 5c8c1640956e ("mptcp: add mptcp_destroy_common helper") 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/protocol.h index 20f04ac85409,7cfe52aeb2b8..000000000000 --- a/net/mptcp/protocol.h