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;
Content-Type: multipart/mixed; boundary="------------ghqasT1MlglPr5sFfYBBlhBs"
Message-ID: <6f8d3039-e8cf-2e9d-50e3-a48770f624b5@tessares.net>
Date:   Sat, 3 Jun 2023 09:35:12 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.0
Subject: Re: [PATCH net v3] net/ipv4: ping_group_range: allow GID from
 2147483648 to 4294967294 - manual merge
Content-Language: en-GB
To:     Akihiro Suda <suda.gitsendemail@gmail.com>,
        linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, segoon@openwall.com, kuniyu@amazon.com
Cc:     Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>, suda.kyoto@gmail.com,
        Stephen Rothwell <sfr@canb.auug.org.au>
References: <20230601031305.55901-1-akihiro.suda.cz@hco.ntt.co.jp>
From:   Matthieu Baerts <matthieu.baerts@tessares.net>
In-Reply-To: <20230601031305.55901-1-akihiro.suda.cz@hco.ntt.co.jp>
Precedence: bulk

This is a multi-part message in MIME format.
--------------ghqasT1MlglPr5sFfYBBlhBs
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

Hello,

On 01/06/2023 05:13, Akihiro Suda wrote:
> With this commit, all the GIDs ("0 4294967294") can be written to the
> "net.ipv4.ping_group_range" sysctl.
> 
> Note that 4294967295 (0xffffffff) is an invalid GID (see gid_valid() in
> include/linux/uidgid.h), and an attempt to register this number will cause
> -EINVAL.
> 
> Prior to this commit, only up to GID 2147483647 could be covered.
> Documentation/networking/ip-sysctl.rst had "0 4294967295" as an example
> value, but this example was wrong and causing -EINVAL.

FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

  e209fee4118f ("net/ipv4: ping_group_range: allow GID from 2147483648
to 4294967294")

and this one from 'net-next':

  ccce324dabfe ("tcp: make the first N SYN RTO backoffs linear")

----- Generic Message -----
The best is to avoid conflicts between 'net' and 'net-next' trees but if
they cannot be avoided when preparing patches, a note about how to fix
them is much appreciated.

The conflict has been resolved on our side[1] and the resolution we
suggest is attached to this email. Please report any issues linked to
this conflict resolution as it might be used by others. If you worked on
the mentioned patches, don't hesitate to ACK this conflict resolution.
---------------------------

Regarding this conflict, I simply took the modifications from both sides.

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/f170c423f567
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
--------------ghqasT1MlglPr5sFfYBBlhBs
Content-Type: text/x-patch; charset=UTF-8;
 name="f170c423f56781e5957cd5b3c4de781515ed2c2c.patch"
Content-Disposition: attachment;
 filename="f170c423f56781e5957cd5b3c4de781515ed2c2c.patch"
Content-Transfer-Encoding: base64

ZGlmZiAtLWNjIG5ldC9pcHY0L3N5c2N0bF9uZXRfaXB2NC5jCmluZGV4IDZhZTMzNDVhM2Jk
Ziw4OGRmZTUxZTY4ZjMuLjBiYjViMDMwODhlNwotLS0gYS9uZXQvaXB2NC9zeXNjdGxfbmV0
X2lwdjQuYworKysgYi9uZXQvaXB2NC9zeXNjdGxfbmV0X2lwdjQuYwpAQEAgLTM0LDkgLTM0
LDggKzM0LDkgQEBAIHN0YXRpYyBpbnQgaXBfdHRsX21pbiA9IDEKICBzdGF0aWMgaW50IGlw
X3R0bF9tYXggPSAyNTU7CiAgc3RhdGljIGludCB0Y3Bfc3luX3JldHJpZXNfbWluID0gMTsK
ICBzdGF0aWMgaW50IHRjcF9zeW5fcmV0cmllc19tYXggPSBNQVhfVENQX1NZTkNOVDsKICtz
dGF0aWMgaW50IHRjcF9zeW5fbGluZWFyX3RpbWVvdXRzX21heCA9IE1BWF9UQ1BfU1lOQ05U
OwotIHN0YXRpYyBpbnQgaXBfcGluZ19ncm91cF9yYW5nZV9taW5bXSA9IHsgMCwgMCB9Owot
IHN0YXRpYyBpbnQgaXBfcGluZ19ncm91cF9yYW5nZV9tYXhbXSA9IHsgR0lEX1RfTUFYLCBH
SURfVF9NQVggfTsKKyBzdGF0aWMgdW5zaWduZWQgbG9uZyBpcF9waW5nX2dyb3VwX3Jhbmdl
X21pbltdID0geyAwLCAwIH07Cisgc3RhdGljIHVuc2lnbmVkIGxvbmcgaXBfcGluZ19ncm91
cF9yYW5nZV9tYXhbXSA9IHsgR0lEX1RfTUFYLCBHSURfVF9NQVggfTsKICBzdGF0aWMgdTMy
IHUzMl9tYXhfZGl2X0haID0gVUlOVF9NQVggLyBIWjsKICBzdGF0aWMgaW50IG9uZV9kYXlf
c2VjcyA9IDI0ICogMzYwMDsKICBzdGF0aWMgdTMyIGZpYl9tdWx0aXBhdGhfaGFzaF9maWVs
ZHNfYWxsX21hc2sgX19tYXliZV91bnVzZWQgPQo=

--------------ghqasT1MlglPr5sFfYBBlhBs--