From nobody Mon Jan 23 22:12:21 2023
X-Original-To: dev-commits-src-branches@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 4P148j59dJz2t0sK;
Mon, 23 Jan 2023 22:12:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4P148j4N4pz3Mdh;
Mon, 23 Jan 2023 22:12:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1674511941;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=QxNd2Wv6LYCBqqgauVlNzPNqG6OmUXzq46jOrlvhHqY=;
b=XesCdPFQw26pH9XE/u8DjSEiqAmFAYkFQky5NHCrDTuZ2X/939zQyl+P8B3G3+7u/8mDUc
0zYIevzNcI7ynB6DW8aqCN2SPNkTxiRTscrnXv0JFMZGSoARVDpuN3uMWuQ+L66x9K29HV
7SlgikCWudTcQdFM/CbkzdMztn44BbSTEezkNZz9NIusk4a/AQI7B110cJL4LHoa4Ks8RL
Smfi9NzHLW2fFGwCMorOPX/+qeNWitTfSFTeOSsyG6nomYQ6H3TAqBCsuwsdoKT8ZueU0O
CIy+LHIQ1dUFVimA0DMO7NqXu6Zssi75hhE4iqppvtsjsXzKGAQivhGIGuTA7w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1674511941;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=QxNd2Wv6LYCBqqgauVlNzPNqG6OmUXzq46jOrlvhHqY=;
b=OsKo/TuQu9qwIlklFpKm3ERNr5GTynSlYYwYi2qqjx9h+cbp/m+lJW0vKW/rJ+X7el9f9a
SVlopOdJ3BPfQgaLf0Y0ooAXLqu1qKZHiDZ4Dv/IuldVSP7AZlv7asgccLl9v/iEoMfTwM
ImPA3xtl3bAIPuAywg3tAQU1yvQVVLV72FyYMUUpcUIShEK9RvGjVwweJUbjn8nNSTQkTx
/LRS6W6fYXXUxn19yWwT+QGS4tZUPMP2SZbnLXeMFPNIaQ55RMOs8id3NZyPgWLVfvVU9J
XdLqycOJnDrwl3Clf2jrkHBnfDyFKaaJeGnHGjBhDphDwUzh4DwW38BwMlQCtw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511941; a=rsa-sha256; cv=none;
b=BaKJVidy9ykdwDOqFevDnBM3vRYzZnMlZwooL8y1rXoBKvK4tfQFpA6QkCGR7/jNZN18mN
LYU3GTSoxdUXLp0EmutK1MXc1sqN23rydVJu05FIXe2lfuPWfrGwKVfo57Zy9G3zmY7Pmq
KWoQLIWBvOno80AvyUUY3zucpo9oi8r2yS7fIh8KJNjIxM/OkECeYf7w9mww8h9TNTwyhR
FQ7z8Yq3oUlzYLaXOFHWv5B0g0vf1KEsi3mzdT0vvEOQbHnzWrb+/BrEbVA+CRMZdvRhHF
gWs8xQpVj4d2/bnOLHMhHoFNhR3iozO8FuSaSe8VV1E96crc8nzDYxuT32O8Yw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P148j3V3nzlZ5;
Mon, 23 Jan 2023 22:12:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NMCLB3017334;
Mon, 23 Jan 2023 22:12:21 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMCLK9017333;
Mon, 23 Jan 2023 22:12:21 GMT
(envelope-from git)
Date: Mon, 23 Jan 2023 22:12:21 GMT
Message-Id: <202301232212.30NMCLK9017333@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Subject: git: a16f805f820e - stable/13 - man: add Netlink reference to socket(2)
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: melifaro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a16f805f820e00b6b2ef1f8b9a6c7408bd2aec6d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by melifaro:
URL: https://cgit.FreeBSD.org/src/commit/?id=a16f805f820e00b6b2ef1f8b9a6c7408bd2aec6d
commit a16f805f820e00b6b2ef1f8b9a6c7408bd2aec6d
Author: Alexander V. Chernikov <melifaro@FreeBSD.org>
AuthorDate: 2023-01-14 17:35:43 +0000
Commit: Alexander V. Chernikov <melifaro@FreeBSD.org>
CommitDate: 2023-01-23 22:09:04 +0000
man: add Netlink reference to socket(2)
Reviewed by: lwhsu, pauamma, gbe
Differential Revision: https://reviews.freebsd.org/D38054
(cherry picked from commit b0286ee504c605027c747e061591535c67032cf5)
---
lib/libc/sys/socket.2 | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index b23d207c9730..7cff244345e9 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -65,7 +65,11 @@ PF_LINK Link layer interface,
PF_KEY Internal key-management function,
PF_NATM Asynchronous transfer mode protocols,
PF_NETGRAPH Netgraph sockets,
+<<<<<<< HEAD
PF_IEEE80211 IEEE 802.11 wireless link-layer protocols (WiFi),
+=======
+PF_NETLINK Netlink protocols,
+>>>>>>> b0286ee504c6 (man: add Netlink reference to socket(2))
PF_BLUETOOTH Bluetooth protocols,
PF_INET_SDP OFED socket direct protocol (IPv4),
PF_INET6_SDP OFED socket direct protocol (IPv6)