From mboxrd@z Thu Jan 1 00:00:00 1970 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=-5.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no 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 25334C4741F for ; Fri, 2 Oct 2020 00:09:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB925207DE for ; Fri, 2 Oct 2020 00:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387430AbgJBAJz (ORCPT ); Thu, 1 Oct 2020 20:09:55 -0400 Received: from mga18.intel.com ([134.134.136.126]:25712 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733085AbgJBAJy (ORCPT ); Thu, 1 Oct 2020 20:09:54 -0400 IronPort-SDR: uj1mqgGHVCYH7vdSYaruMn9pVeTxnCWOFAxfR6+N81H/iKzUfteU40zGq8S8Q3AQnspEKwp547 ZVDygV4McJ8A== X-IronPort-AV: E=McAfee;i="6000,8403,9761"; a="150661745" X-IronPort-AV: E=Sophos;i="5.77,325,1596524400"; d="scan'208";a="150661745" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2020 17:09:53 -0700 IronPort-SDR: VeSzCLeyUvbecGZ3uyMh2Vx1dlowJMxbbQcBamEqfsaEvj66dkm0RcW3HbWoD2aFOoyVqsbXQl oYvgWtwS5VUA== X-IronPort-AV: E=Sophos;i="5.77,325,1596524400"; d="scan'208";a="346263997" Received: from vuongn2x-mobl.amr.corp.intel.com ([10.255.228.170]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2020 17:09:52 -0700 Date: Thu, 1 Oct 2020 17:09:52 -0700 (PDT) From: Mat Martineau X-X-Sender: mjmartin@vuongn2x-mobl.amr.corp.intel.com To: Stephen Rothwell cc: David Miller , Networking , Linux Next Mailing List , Linux Kernel Mailing List , Geliang Tang Subject: Re: linux-next: manual merge of the net-next tree with the net tree In-Reply-To: <20201001135237.6ec2468a@canb.auug.org.au> Message-ID: References: <20201001135237.6ec2468a@canb.auug.org.au> User-Agent: Alpine 2.23 (OSX 453 2020-06-18) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 1 Oct 2020, Stephen Rothwell wrote: > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc net/mptcp/protocol.h > index 20f04ac85409,7cfe52aeb2b8..000000000000 > --- a/net/mptcp/protocol.h > +++ b/net/mptcp/protocol.h > @@@ -387,7 -407,8 +407,8 @@@ void mptcp_data_ready(struct sock *sk, > bool mptcp_finish_join(struct sock *sk); > void mptcp_data_acked(struct sock *sk); > void mptcp_subflow_eof(struct sock *sk); > -bool mptcp_update_rcv_data_fin(struct mptcp_sock *msk, u64 data_fin_seq); > +bool mptcp_update_rcv_data_fin(struct mptcp_sock *msk, u64 data_fin_seq, bool use_64bit); > + void mptcp_destroy_common(struct mptcp_sock *msk); > Yes, this is the appropriate conflict resolution. Thanks! -- Mat Martineau Intel