From nobody Tue Jan 24 21:46:46 2023 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 4P1gXl04pbz3bZhH; Tue, 24 Jan 2023 21:46:47 +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 4P1gXk6MDGz49f6; Tue, 24 Jan 2023 21:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674596806; 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=umtsQKWk96hE7A/GrLvl4pwDZaSOlzwbmf65RJOv3Uo=; b=s1foQW2TAiLL6rxx9oLa7l1VLkU3ntFJu4rU89SkuTjfO8QbMDJWfkMWKz2rwNVpJG+eNF CvBb1gMmUpIzOiLL6NqdTghs+MmjKFXHrifqF8n7RixwdhP6oLAJT+VkXYfyh8h0c/OXJ9 wWH2HruTYIirRMkVHqGXsXyizSsoUj00yriAzbts1JQ1FIDbrhyqs1NGXkFs2FHSJDhp21 wAElhPwtgM133PvP4x+zO38FjUwRJhWyMOG23AG3Rl8HBYQogShJ7P+rC2R7PNsHIgUkcn TmaD7QoGrrldms/DS5XWdi3GT6ve6dqdLh9k9odL8fPdROLOW8mblJp7Ny+g3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674596806; 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=umtsQKWk96hE7A/GrLvl4pwDZaSOlzwbmf65RJOv3Uo=; b=kAT/O0Xndg8r+Y7PYxHvGOCfHBd3dw26fs91naDKFMNMxe3nKT0hX6Kz38nPU/Zsr/cRl3 6mO644imnau6WGBMLwqhanRiiZhWhUAeetokV0KwC8K3Hd0Bn1KKr2Z6KjyNHW7Do/1W40 GMu/Wpn1Z44QiuZmTVmPSlQvg4yryT5sjY9W+ty+of5tMoN2OzjkXjtZHfszsAopZLpOgZ 8fyfWso1dKaQVNBb2pIAp98eQ7KmSPaeudulIdyy2wXHlGXttj8c7TVYhnaCh+Vvrj1kFd YGqFfoHO7camgE95HL+S5d1jVFT1ElMbak5MBFuTlcp8Fo8zl6+CH6xRDwFlvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674596806; a=rsa-sha256; cv=none; b=eW8zSwn7jUpkfmCS20dYq09pDFSQG9vGfWJT67KLYTUi0o7DMoVfJ9zUOePycVko4peyc9 8d2nQZEb5E3arcnF/IYIyq08780sNSYKrWBJX+rR7m6UH3OAO3q22tc8OYLHK91hVyxQYT E2xePel5VF1/dn3X5zhyhvEEtzSSxm0Vdnu78U4hEQlkUEU3yYen/zoB3eSEtNkspEZ0iE 1mB4hZnb00z/aFffdOr1gv0nedRH4dJNBgKyoCvESYm49cBTCv23DDQYZgvGQ9ZZU/Hv+E WbUkVPKv0nwuHwq1KFyPYjI4OSvSRfWNOQxeNbSN7N6+VgbFG84C3UemJhLXNw== 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 4P1gXk5FDCzPr9; Tue, 24 Jan 2023 21:46:46 +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 30OLkkES040002; Tue, 24 Jan 2023 21:46:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OLkkdB040001; Tue, 24 Jan 2023 21:46:46 GMT (envelope-from git) Date: Tue, 24 Jan 2023 21:46:46 GMT Message-Id: <202301242146.30OLkkdB040001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 9fcc6175008c - stable/13 - man: fix socket.2 merge from a16f805f820e 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9fcc6175008cf0aea9dce6d30f4259080b791325 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=9fcc6175008cf0aea9dce6d30f4259080b791325 commit 9fcc6175008cf0aea9dce6d30f4259080b791325 Author: Alexander V. Chernikov AuthorDate: 2023-01-24 21:44:51 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-24 21:44:51 +0000 man: fix socket.2 merge from a16f805f820e Reported by: Herbert J. Skuhra --- lib/libc/sys/socket.2 | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2 index 7cff244345e9..cbe74809d214 100644 --- a/lib/libc/sys/socket.2 +++ b/lib/libc/sys/socket.2 @@ -65,11 +65,8 @@ 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)