| Message ID | 20240228103048.19255709@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-84221-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id
bq27csp3026806dyb;
Tue, 27 Feb 2024 15:33:03 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCXHxNBGpG/F0MyuVK55eMHMEOqJqYEBTJP68xB89cqGFJW6lsYDoMtA0G0O/NxYukMsjJRV6PO3P0q21FNMZnpiNI5PeA==
X-Google-Smtp-Source:
AGHT+IF0wUR+7VulJbqbo5+7Ba6QSccZyOhD+cYmj3zAsydd3I+WiGycpfrMwvtPDXlvSs+jwNNn
X-Received: by 2002:a1f:6dc1:0:b0:4d3:34f0:be92 with SMTP id
i184-20020a1f6dc1000000b004d334f0be92mr1790774vkc.1.1709076783619;
Tue, 27 Feb 2024 15:33:03 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1709076783; cv=pass;
d=google.com; s=arc-20160816;
b=thF4cCGZFzcrF543pZb0CqsZcp3O4bx4tAY+iGlgeJ94xsET9yjzm3q+cHvJDFzHTt
GXLsO6xNCyER4aYdEVkNsREpjA9pwMKlOfLBwk8SuDmQx38T6RqOegj9Zx08MWJP8gTQ
wTXkhjJTzRmIaeGrbjawS1GE+0UMH5Bc8KG1tLaM1Rr2fnNBz0n2ccByMpEOtuSbYRmd
2CodHoXhxqflvcISBR3n3GJVuj5ZUkaLsvkONYsLDn3k51QdiDNWqS9NNVEzkHmsz3NZ
V2UltTMedNioqgy4KHZ0tGdaAjnzaTdVhnRr+kJfD1zfpDercbEU0Nbx9/v+FKfX5j3/
uxBQ==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence
:message-id:subject:cc:to:from:date:dkim-signature;
bh=MZchj47zYj+QSOmLHezdAMO1dxkIaLbd/TINPOfwfV8=;
fh=H1HIUTdrzh9cLxPGCnF/rTDKB360Jwi6iPtZ6tmZiow=;
b=RsOxvSWbcW/7ICEgUoJnd1duKPtZEg9Li6knZDbTfN4rJbC51kLiidYQRBwnAvD6fH
xMSebbAFlJQiareykWxxELhGBKSUVxWo2TY2bXpooyHtyZhXEPdy4dmEBJzf6RrBP8wB
GfxOWxfPrrehWLcaxSyUTN3mvafNr0ttwQfeve257vd6cw6j12L1aNh/p4A5pWpW14NA
MQTZHHTpHKpueAMrhyiKGCcj5BjSKkpuxpV8/92jAnqDkJPe/ONJP+H61GZhRW2zC005
m2f3EyoFOn/TDRQd37CW/mvPC2622dtn9zcKc5W9zTrWulh0rW3ARgJLLz/+SgtJoVrX
iTHw==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=FKhiW4nR;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-84221-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45d1:ec00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-84221-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org.
[2604:1380:45d1:ec00::1])
by mx.google.com with ESMTPS id
b10-20020ac8540a000000b0042e6c6bedf6si8611829qtq.535.2024.02.27.15.33.03
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 27 Feb 2024 15:33:03 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-84221-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=FKhiW4nR;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-84221-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45d1:ec00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-84221-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4AF471C20D48
for <ouuuleilei@gmail.com>; Tue, 27 Feb 2024 23:33:03 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 8ACD457877;
Tue, 27 Feb 2024 23:30:58 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b="FKhiW4nR"
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id E95FA56472;
Tue, 27 Feb 2024 23:30:51 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=150.107.74.76
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1709076655; cv=none;
b=q0YhmNrl4PWsm1ev14+DabeTjIkCxJpu9cTRNfjs9FCdfnp7NgzAP6DBYNBRaKltK8WHb0wny0aR0e/rnoENfLbQLaTAqbUPZc2VTYi8rr1cadCQP5s/6IaiW/dgY1bjP7/6FHGDRW6hOAzBKIPVfyjxvjPIRaq5kP/jBN4tsuI=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1709076655; c=relaxed/simple;
bh=bUJHIJRg3POahLw0GfORsGHH1fd4pzb+GmAQDnwGjsU=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=mTkRzdvinqkW3bdmhJtHDmbZjpyjuWoVgYiv+iSLcdV/n3kPu5wH31S2G6a6rGo/iyJ7IMwXhe9Ea6x7HYKSvFqO4Ovfw2ImgofXf0rONpxbUNxp+l+srirYX/ETgIZjqOPFMI6fAyFfst+EWC6/8r3a2UJeWuUKgB8IVWamWRQ=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au;
spf=pass smtp.mailfrom=canb.auug.org.au;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b=FKhiW4nR; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=canb.auug.org.au
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1709076650;
bh=MZchj47zYj+QSOmLHezdAMO1dxkIaLbd/TINPOfwfV8=;
h=Date:From:To:Cc:Subject:From;
b=FKhiW4nRfdjyM+u8+WdOkeXVvaRKG4pjk+Aw/Xny5s+23YMn4jvoI+wFzObH/tU09
DFpGv2+eQ/C5nu4NbZ2728E4V5rfa1NVzIqatGxbb2w0V+KgGv6tiVBGBM5jL6WrRe
9IRJWQpg/xmO+1pHUzQUh+ShJa+ce7FI5L3Cdfm37aYmHj80wwLOoYZqLUaXI+PA5/
+P95oa4hDre7glsxrUn+ToYzMqviKggtfTzVSCCeHIzJFYEv1s8gCkER/O3x3yKjmK
AXCfzgjtKPosHfJ+7pMPP8uAmlRqSv0ZidRtGPJtdJ2TWr4ZojJ/ETzP+Sqgo7M4GI
B/feo2gGFD03A==
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 X25519 server-signature RSA-PSS (4096 bits) server-digest
SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4Tktyd5Hj2z4wcH;
Wed, 28 Feb 2024 10:30:49 +1100 (AEDT)
Date: Wed, 28 Feb 2024 10:30:48 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>, Linux Kernel Mailing List
<linux-kernel@vger.kernel.org>, Linux Next Mailing List
<linux-next@vger.kernel.org>, "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20240228103048.19255709@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5=YtmZs2k2MXH8fb2+owVj5";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1792096897013665210
X-GMAIL-MSGID: 1792096897013665210
|
| Series |
linux-next: manual merge of the net-next tree with the net tree
|
|
Commit Message
Stephen Rothwell
Feb. 27, 2024, 11:30 p.m. UTC
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/mptcp/protocol.c
between commit:
adf1bb78dab5 ("mptcp: fix snd_wnd initialization for passive socket")
from the net tree and commits:
d440a4e27acd ("mptcp: annotate lockless access for the tx path")
9426ce476a70 ("mptcp: annotate lockless access for RX path fields")
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.c index 7833a49f6214,9df4eaddfd48..000000000000 --- a/net/mptcp/protocol.c