git: a16f805f820e - stable/13 - man: add Netlink reference to socket(2)

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)