| Message ID | 20230605100816.08d41a7b@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2384803vqr;
Sun, 4 Jun 2023 17:54:26 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ5WhanU5kXw1KwYQW+y8LA30gEOhyQR6eJM0JG0wdy8BO1bB1y+8Hx2yYir9PxczYs9loUg
X-Received: by 2002:a54:4584:0:b0:398:3152:fc3d with SMTP id
z4-20020a544584000000b003983152fc3dmr6191228oib.44.1685926466082;
Sun, 04 Jun 2023 17:54:26 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1685926466; cv=none;
d=google.com; s=arc-20160816;
b=NJcEsXhvl0L5kR6zPdAc81y3U9UQxUCFAK/XLoGM/aYt7yZ4RhUYaMyovvGCj/86nm
cNc+GI0sGolNZ8BIvUtU2TQdKA2A0GKlhqc1FqcOEd9FrdXaxAeIaSOkHsOs5ICI5UTy
+Te9xJZC91enFS/UmZvwwcMQr5dLt/BddP6jJZrBqySncJYquob32XC7lNy4v0lGugxs
8IrVBK+6PbTq61oDpubthb1nfi8q7PTUl8A/rDKXhSeQ1yr+Rv0SLRrhTw6PQt8Rfpr1
tXRpH0d2IXuLcJwp5YD1p3KYnqs3/q/+JbCjiioipvJgGHTRP5yb5hPRKeig8i4mAqYL
wgDQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=pOuSQOaAtbYZsqBRiDrrigcw5i1OYkXIadN59Arc/E0=;
b=pCjhNVpCdZGDvXCej1GTjMPAXYba3xnc/cJRyjnaFcK3KXlPIqu567UNZfGZkAIO7d
0K8IqeEdqYQbOmSCSUOiIGjoYgp6C+WJduGQnAjcm2XO5iwiUS7Sg6CLdYSy6PUNng+/
U8uhdkTt2wCON2iZN3uLl0otAhmM5av/DP+0su38SGGcKPm1E0JBV0u070/07K+7K6/y
8dIt4CHzDpqkarWqKCSuOJbcq6SK9m4GJXqCbzcwZfwHjxNIGqhh/+LqWHXNMpSkIJC+
Jfe7CPQnZc01PwuYk7ozEZLx21uTJXSsE2FXn6eWpTIWJD6117D1IhjG4UHvi80MbXE/
hviw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=CwEbPaMy;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
s190-20020a625ec7000000b0063b1fbbb8c5si4452721pfb.131.2023.06.04.17.54.10;
Sun, 04 Jun 2023 17:54:26 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=CwEbPaMy;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232351AbjFEAI3 (ORCPT <rfc822;pfffrao@gmail.com> + 99 others);
Sun, 4 Jun 2023 20:08:29 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57024 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229886AbjFEAI1 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 4 Jun 2023 20:08:27 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D6CBCA;
Sun, 4 Jun 2023 17:08:25 -0700 (PDT)
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 4QZDTZ5MLPz4x3x;
Mon, 5 Jun 2023 10:08:18 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1685923699;
bh=pOuSQOaAtbYZsqBRiDrrigcw5i1OYkXIadN59Arc/E0=;
h=Date:From:To:Cc:Subject:From;
b=CwEbPaMySvPrNOJMWKcrPQ2k2yRRLUopa4U+AObiivGk8UZY3mxuwRhdvUKEAG68D
55ECZO3XcxU3XRa0iqCtNqAGH4FDhwOxuQ8sWov2L8EO8rTusoUNwUjvsyRrOAR7lv
PJx6e2mNnG8kWAzQTdR6ancCX3B6ttHoL6TDddGg57hw+jpWqq9XmvBEEzkmHai2e8
+XnZ6WarUIzwOcJcggjg3uQGC080HfwPooynDp8txv7NelD9MyERQsdWB5y8Q685JK
SPKRTkvOIxyHUUioNHZ2mYtFNG3Arb5ff/XOXhknoMoB9BnZlWdufpHZ2mHifyjtZa
Dp21JstSvMDJA==
Date: Mon, 5 Jun 2023 10:08:16 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>,
Akihiro Suda <suda.gitsendemail@gmail.com>,
David Morley <morleyd@google.com>,
Kuniyuki Iwashima <kuniyu@amazon.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Neal Cardwell <ncardwell@google.com>,
Paolo Abeni <pabeni@redhat.com>,
Yuchung Cheng <ycheng@google.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20230605100816.08d41a7b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/u3D+RwDlPWSFsvlRdb6GZfK";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS,
T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1767822029804420879?=
X-GMAIL-MSGID: =?utf-8?q?1767822029804420879?=
|
| Series |
linux-next: manual merge of the net-next tree with the net tree
|
|
Commit Message
Stephen Rothwell
June 5, 2023, 12:08 a.m. UTC
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/sysctl_net_ipv4.c
between commit:
e209fee4118f ("net/ipv4: ping_group_range: allow GID from 2147483648 to 4294967294")
from the net tree and commit:
ccce324dabfe ("tcp: make the first N SYN RTO backoffs linear")
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/ipv4/sysctl_net_ipv4.c index 88dfe51e68f3,6ae3345a3bdf..000000000000 --- a/net/ipv4/sysctl_net_ipv4.c