From nobody Fri Apr 01 03:54:41 2022 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 784821A3A0BE; Fri, 1 Apr 2022 03:54:43 +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 4KV5sG3sD2z4tmX; Fri, 1 Apr 2022 03:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648785283; 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=SlYkRhA1K+VkGxA8daF2k4xUGycepa8n4nstqH4gZyA=; b=F4qav2oi3QG6bn2scF0QGS5FQmtpMHsAYzIZyFLy0BE6BM8Dlmw5VPguq2S08fHHExwW1x Cc02dNIkVSEF0sUrn8FWprmSUXVjd8cNI/upH15fju0tqgpY4sIjj610BL1xxf0r92+wS9 +7+QNpb7cqimD1voVh2D9mVtb/wFyQGH2hkT9Ov6/5t2wXxOmJoQRmMMc1y6K5ryzP9gRA LrfZkJ0kW4I++na07rjsITSW/RNYgQeTM44f1Uz3wq6LCQOcIEs7Hiunma8DarMFWe9W1L 0Q3r7ZRU5IP38zr6ljXvzbwWveiG6yhmj0p3n+RXBmPymz8eCrrjeeNVND0GDA== 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 CF0115093; Fri, 1 Apr 2022 03:54:41 +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 2313sfan056965; Fri, 1 Apr 2022 03:54:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2313sfVS056964; Fri, 1 Apr 2022 03:54:41 GMT (envelope-from git) Date: Fri, 1 Apr 2022 03:54:41 GMT Message-Id: <202204010354.2313sfVS056964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 48402b9e62c4 - stable/12 - Whitespace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 48402b9e62c424256e826ceb63074a76952e565f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648785282; 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=SlYkRhA1K+VkGxA8daF2k4xUGycepa8n4nstqH4gZyA=; b=P2y2VljryHVCxX0Vj2jndYF+tThfL6K4TeAhFHhkbXBes7MuisVDXHx16XBU0ZoXEfkCey Wp5BOPFmhb15dRZ2y8TouvuF80KX/YPRT58NibxqBnXbMAn69cR670VyNjCv4Vt8AU1pJE ucZEOYjK4+T8uGS8NrB55kH3Ex2eocsbtyRjtwR+A0PfgWZrROydiGSlMfmi4WX6FT60Jm oq1l2wKG52pUmRPyTGXvmHgHvIG09UskZbTvfF8m/n8dYXUVpJUWBfZAXze1lS0KUxqvUT H9Ce+EH2VRZ0cMCsGtqbw6nxRvZxVndUcuCqNs5N5q+DSeP+De/FVi1gNDAEXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648785283; a=rsa-sha256; cv=none; b=d4EncrG5hSfJXz/X47aa0geYSz7rv4RV2jli+lSjR+jgvoVh1cO+rld9MD+Rib7Ko/wyn9 77Y6CNVR5x6Gb3y/z0GfLh/UNhqwgWULX8V+EW4/WQCb1yptdI8dtUodroGudtNks7VeHy 33Czm+Q4Gg/vfidTZQC2BRhq2YvSQdUL2dkD0U1moc4ZjecKEKHi8u9NqkiWgIbxMZu/BM wnb16iODiErGS4c4QNNSqkol4n2VlQfYHu+9DcHd/ocgGjzKHfKDCjcB5YVlU5UdknjiA4 pGSOFXNospSzAOBebKj2h/58ixCaQlLF6I1rtlg/soHUspLjduBzfUbEidOidA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=48402b9e62c424256e826ceb63074a76952e565f commit 48402b9e62c424256e826ceb63074a76952e565f Author: Sevan Janiyan AuthorDate: 2019-06-19 11:22:09 +0000 Commit: Warner Losh CommitDate: 2022-04-01 03:54:02 +0000 Whitespace (cherry picked from commit 87278c17c9d8fc693c881e86a68fcdab35ab7140) --- share/misc/bsd-family-tree | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 42d1e4b82ccf..2a955d1d5af0 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -372,7 +372,7 @@ FreeBSD 5.2 | | | | | | | 10.13 | | | OpenBSD 6.1 | | FreeBSD | | | | | | DragonFly 5.0.0 | 11.1 FreeBSD | | | | | | - | | 10.4 | | | | OpenBSD 6.2 DragonFly 5.0.1 + | | 10.4 | | | | OpenBSD 6.2 DragonFly 5.0.1 | | | | | | | | | `------. | | | NetBSD | DragonFly 5.0.2 | | | | | 7.1.1 | | @@ -381,7 +381,7 @@ FreeBSD 5.2 | | | | | | | | | 7.1.2 `--. | | | | | | | | | | | | `-----. OpenBSD 6.3 | - | | | *--NetBSD | | DragonFly 5.2.0 + | | | *--NetBSD | | DragonFly 5.2.0 | | | | 8.0 | | | | | | | | | | DragonFly 5.2.1 | | | | | | | |