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=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 D623AC3F2D0 for ; Fri, 28 Feb 2020 09:07:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F104246A2 for ; Fri, 28 Feb 2020 09:07:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HXnktP/Z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726536AbgB1JHd (ORCPT ); Fri, 28 Feb 2020 04:07:33 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46401 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726413AbgB1JHd (ORCPT ); Fri, 28 Feb 2020 04:07:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582880852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ncZBWSzM/kFbj3x0UGhhSEnICwSq6R9DhzO5S1kkIIA=; b=HXnktP/ZsV/sbbbD8LhZA4GBbuM1rt1o8SNFEO/9eH7HzCEmnjorqQ1FqZJhC9ddN/dxu4 oq/AAQqTvZoYcUHZ3dQYA04prfnjlzQ2xmtwi+QSPVP93NA8WNhq5fi9NJ/0in+dssOsii VDjVnvGLfj0jv//yZxDt13ck9cfYXyI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-323-i6weTFKaNMi8MuaY3GQJ0w-1; Fri, 28 Feb 2020 04:07:28 -0500 X-MC-Unique: i6weTFKaNMi8MuaY3GQJ0w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F29C2190D340; Fri, 28 Feb 2020 09:07:26 +0000 (UTC) Received: from ovpn-118-48.ams2.redhat.com (unknown [10.36.118.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29F6B87B08; Fri, 28 Feb 2020 09:07:24 +0000 (UTC) Message-ID: <938e596f257f782f36c51b849ae7e37f3718c42b.camel@redhat.com> Subject: Re: linux-next: manual merge of the net-next tree with the net tree From: Paolo Abeni To: Stephen Rothwell , David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Florian Westphal Date: Fri, 28 Feb 2020 10:07:26 +0100 In-Reply-To: <20200228102451.0a3d2057@canb.auug.org.au> References: <20200228102451.0a3d2057@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.32.5 (3.32.5-1.fc30) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, 2020-02-28 at 10:24 +1100, Stephen Rothwell wrote: > Today's linux-next merge of the net-next tree got a conflict in: > > net/mptcp/protocol.c > > between commit: > > dc24f8b4ecd3 ("mptcp: add dummy icsk_sync_mss()") > > from the net tree and commit: > > 80992017150b ("mptcp: add work queue skeleton") > > 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. Thank you, the conflict resolution looks good to me. I did not notice the conflict beforehands, sorry. Cheers, Paolo