From nobody Fri Apr 24 20:39:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g2Pvh10F0z6bDSg; Fri, 24 Apr 2026 20:39:28 +0000 (UTC) (envelope-from gallatin@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2Pvh0RqZz3VxW; Fri, 24 Apr 2026 20:39:28 +0000 (UTC) (envelope-from gallatin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777063168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3ZzcHcgc5mNy+uS9am13shCSIpxAh7TL/659biAK2Go=; b=hRbX8YW5PeNc3Gs2v1/sYSVjUXfANwjIjj6kqgCI8guHnm0tMNb32Yv1yOUal9aPL/SS4R GZmdPN4fj1BPjJz3UQmuzzlCreks57u8YY4/Q5lMGPvfg0zAHI4rwGGoWF9C8pFugei3eY OvPyanpkqyZCFccW1Q54DANvtl8VHGyB8ByS+GGPEyu7pL1Qb4Skvlw+y1vMLo2Se/DnW4 Q/PsiJC9fHYbv0vgMrnb/qnsC7xeOTrAVu5rywkH8mXk1sZ7YBMwNRKQfE5CVIph8FSv/z 9KUoLFmVZOHhY9Dl2qJrYxCkd5lUPxwATLYRhUFfOQmGFBGGBuQAkoniYnLR3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777063168; a=rsa-sha256; cv=none; b=Y0pal7jpu2SasjSvFePgzNuIGLCWC7Z77wPkc3RJmcJTjhc6T+tWviJtOH9SdnWJeHCpYe uYuGzV3WFB/0rf5lhZECRZKznZklOYzqGwjoaZOroxThElvZPNelyoyeyoX9a8HbeRtW7A nr+Y/u+l183hmS/ZikTLm1dBT2rN2tRHGgbCzMHdLtQtxTgCdJl0fMIhq+tq+NE/PRE7gp 8cC2SZpantinpwwJ4/FC8imeKti1CqhLaaeegf+6WUnD65iv9r47cDq1pfXNyn33gTjyL+ BTdS1Gyna7INBBK1nC76eqLkqe6093VrtJ1ylIQ8NKOqgwNfqo2ZVz6rmv8TlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777063168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3ZzcHcgc5mNy+uS9am13shCSIpxAh7TL/659biAK2Go=; b=At7OWBXMMy/8Cr4fw89xO1vpatCyHCFkCH0S5NQykUgrd4znrOwLIZGlJmvoYkT9w2HP/k KYg3S10JQfNZABQR83Q16jgEGk4O5znBmZx3X+m41zajO5Y/gIGq4qRG8YXWnPCs61cqvN kK0m3pcT7Df9pP5i2MMB4Vi/LxiCXKyyHJczLPsVZC05ophTZgehWN24o0/HykNUQ6QTab jsqcT7akgW/PTb3vYXNLvT0Jy74ZHW3R4rkLOALHNSZSWWD7TbDcM2x9Sh2rw9/2q0jO8D mva7ijSHG2249uyHPtGK/gVae4wmsozrIbOzBVKm44nHcTYetypSBhTt5kgwxA== Received: from fauth-a1-smtp.messagingengine.com (fauth-a1-smtp.messagingengine.com [103.168.172.200]) (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) (Client did not present a certificate) (Authenticated sender: gallatin) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g2Pvg6xTrzLK0; Fri, 24 Apr 2026 20:39:27 +0000 (UTC) (envelope-from gallatin@freebsd.org) Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfauth.phl.internal (Postfix) with ESMTP id 4B7AEF4006A; Fri, 24 Apr 2026 16:39:27 -0400 (EDT) Received: from phl-imap-02 ([10.202.2.81]) by phl-compute-05.internal (MEProxy); Fri, 24 Apr 2026 16:39:27 -0400 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgdejuddtudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefoggffhffvkfgjfhfutgesrgdtreerredttdenucfhrhhomhepfdffrhgvficuifgr lhhlrghtihhnfdcuoehgrghllhgrthhinhesfhhrvggvsghsugdrohhrgheqnecuggftrf grthhtvghrnhepkeeitdehvefhjefhudekgfdugedtveejlefghedtvdevhffguefggfef veffveegnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghgrlhhlrghtihhnodhmvghsmhht phgruhhthhhpvghrshhonhgrlhhithihqddufeefheelvddvudeiqddvleehtdegudekge dqghgrlhhlrghtihhnpeepfhhrvggvsghsugdrohhrghesfhgrshhtmhgrihhlrdgtohhm pdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeguvg hvqdgtohhmmhhithhsqdhsrhgtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthht ohepuggvvhdqtghomhhmihhtshdqshhrtgdqmhgrihhnsehfrhgvvggsshgurdhorhhgpd hrtghpthhtohepghgrlhhlrghtihhnsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohep shhrtgdqtghomhhmihhtthgvrhhssehfrhgvvggsshgurdhorhhg X-ME-Proxy: Feedback-ID: i41414658:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 1E65B700069; Fri, 24 Apr 2026 16:39:27 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 X-ThreadId: AnMDqwyqQvEw Date: Fri, 24 Apr 2026 16:39:06 -0400 From: "Drew Gallatin" To: "Andrew Gallatin" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: In-Reply-To: <69ebd2f6.37611.54446236@gitrepo.freebsd.org> References: <69ebd2f6.37611.54446236@gitrepo.freebsd.org> Subject: Re: git: 5923b363ca61 - main - net: Fix collision between SIOCGI2CPB and IPSECGREQID Content-Type: multipart/alternative; boundary=4b9898f070b2b20cb7726e777bfdfcb320964fa1 --4b9898f070b2b20cb7726e777bfdfcb320964fa1 Content-Type: text/plain Content-Transfer-Encoding: 7bit On Fri, Apr 24, 2026, at 4:30 PM, Andrew Gallatin wrote: > The branch main has been updated by gallatin: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5923b363ca616e7cd4fdec1f4f0bf0c98b272468 > > commit 5923b363ca616e7cd4fdec1f4f0bf0c98b272468 > Author: Andrew Gallatin > AuthorDate: 2026-04-24 20:01:44 +0000 > Commit: Andrew Gallatin > CommitDate: 2026-04-24 20:30:24 +0000 > > net: Fix collision between SIOCGI2CPB and IPSECGREQID > > It turns out interface ioctls are defined not just in sockio.h, but are > spread among many files. When I added SIOCGI2CPB at the bottom of the > file, the next number (160) collided with an ioctl (IPSECGREQID) that > I was unaware of in another file. Fix this by moving to a number that > is unclaimed. > > Fixes: cf1f21572897 (net: Add SIOCGI2CPB ioctl & add page/bank fields to ifi2creq) > Reported by: dhw > Reviewed by: imp > Note that the main consequence of this collision is mce whining in dmesg, so I didn't feel it warranted a FreeBSD version bump. --4b9898f070b2b20cb7726e777bfdfcb320964fa1 Content-Type: text/html Content-Transfer-Encoding: quoted-printable


On Fri, Apr 24, 2026, at 4:30 PM, Andrew Gallatin wrot= e:
The branch m= ain has been updated by gallatin:


commit 5923b= 363ca616e7cd4fdec1f4f0bf0c98b272468
Author:   &= nbsp; Andrew Gallatin <gallat= in@FreeBSD.org>
AuthorDate: 2026-04-24 20:01:44 +0000
Commit:     Andrew Gallatin <gallatin@FreeBSD.org>
Comm= itDate: 2026-04-24 20:30:24 +0000

  &= nbsp; net: Fix collision between SIOCGI2CPB and IPSECGREQID
&n= bsp;   
    It turns out interfa= ce ioctls are defined not just in sockio.h, but are
 &nbs= p;  spread among many files.  When I added SIOCGI2CPB at the b= ottom of the
    file, the next number (160) co= llided with an ioctl (IPSECGREQID) that
    I w= as unaware of in another file.  Fix this by moving to a number that=
    is unclaimed.
   =  
    Fixes: cf1f21572897 (net: Add SIOCGI= 2CPB ioctl & add page/bank fields to ifi2creq)
  = ;  Reported by: dhw
    Reviewed by: imp


Note that the main c= onsequence of this collision is mce whining in dmesg, so I didn't feel i= t warranted a FreeBSD version bump. 
--4b9898f070b2b20cb7726e777bfdfcb320964fa1--