From owner-freebsd-stable@freebsd.org Sat May 1 07:07:22 2021 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E276862180B for ; Sat, 1 May 2021 07:07:22 +0000 (UTC) (envelope-from felix@palmen-it.de) Received: from stef.palmen-it.de (stef.palmen-it.de [84.38.67.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXL0B1Y0Vz3Ppy for ; Sat, 1 May 2021 07:07:21 +0000 (UTC) (envelope-from felix@palmen-it.de) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=palmen-it.de; s=20200414; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:To:From:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=wYVCOio2oGBtIVlm7+xBGs4KSmwmmeDKZnCc30TNaI8=; b=5XK2wNeFWCiYQAqHK8ZT2CnY1 uPJqDl0eHZCPXfwztbU4EcMZvsH3yBKC9UcIy2THGzv2q5CiO62ZCqCCxv9C26uzSUycEpg1DGgPq 2TrFSeeXOkPt0hua099Dofedx98OT38NNslMnY8/RE+Xo4/qiX8L6AcIcYscMrp09Xz1NPnnOnEGg eRocPTLf4npm+YyyvK53RYr0OQC6KmXR1boWVI2a4LHod4Eb5V1HhgOlZSOmltOkZPvZYZVafdKmp cI58CwHLEFykNMKy19KH3sjrNylytdHqWEOysfG/EV2QISvx0PUebqALHkpe4fqPDFAWjf+aBFLcV /NPay4F2w==; Received: from [192.168.71.101] (helo=mail.home.palmen-it.de) by stef.palmen-it.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lcjib-0000XO-4L for freebsd-stable@freebsd.org; Sat, 01 May 2021 09:07:13 +0200 Received: from nexus.home.palmen-it.de ([192.168.99.2]) by mail.home.palmen-it.de with esmtpsa (TLS1.3) tls TLS_CHACHA20_POLY1305_SHA256 (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lcjia-000P81-Rd for freebsd-stable@freebsd.org; Sat, 01 May 2021 07:07:12 +0000 Date: Sat, 1 May 2021 09:07:12 +0200 From: Felix Palmen To: freebsd-stable@freebsd.org Subject: mergemaster (was: Congratulations on the stable/13 release!) Message-ID: <20210501070712.2knhe5uuqfp76ddi@nexus.home.palmen-it.de> Mail-Followup-To: freebsd-stable@freebsd.org X-Face: /1K@t"h.}e~pR@]c7HorQ!T`F^RJCa'BCr#e>IKA{>C/9OTGB4|xh"y2{?1Z5M i2w"AH^pN_LlHR^{+f',_Np~; .B; !M/bL}*qk]p5*r7F5vW}; {:@4u5S?T&f0$7BJ-71Q5SV]:v$`5 A0[DZ:=?S52x8HJ~5@^P_\T@MsjG{R( Organization: palmen-it.de References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="5ql225fvnxdihlnt" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20210205 X-Rspamd-Queue-Id: 4FXL0B1Y0Vz3Ppy X-Spamd-Bar: ------- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=palmen-it.de header.s=20200414 header.b=5XK2wNeF; dmarc=pass (policy=none) header.from=palmen-it.de; spf=pass (mx1.freebsd.org: domain of felix@palmen-it.de designates 84.38.67.7 as permitted sender) smtp.mailfrom=felix@palmen-it.de X-Spamd-Result: default: False [-7.80 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:84.38.67.7]; TO_DN_NONE(0.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; HAS_ORG_HEADER(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; SUBJECT_HAS_EXCLAIM(0.00)[]; RCVD_IN_DNSWL_MED(-0.20)[84.38.67.7:from]; DMARC_POLICY_ALLOW(-0.50)[palmen-it.de,none]; DKIM_TRACE(0.00)[palmen-it.de:+]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:204119, ipnet:84.38.64.0/20, country:DE]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[palmen-it.de:s=20200414]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; RCPT_COUNT_ONE(0.00)[1]; DWL_DNSWL_LOW(-1.00)[palmen-it.de:dkim]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2021 07:07:22 -0000 --5ql225fvnxdihlnt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Andrew Reilly [20210501 11:45]: > mergemaster -p > make -s installworld > mergemaster -U Note you shouldn't use mergemaster any more. It works fine for upgrading to 13, but after that, I'd expect problems because it relies on the old VCS tags. Use etcupdate instead, see here for details: It's also documented in the handbook: --=20 Dipl.-Inform. Felix Palmen ,.//.......... {web} http://palmen-it.de {jabber} [see email] ,//palmen-it.de {pgp public key} http://palmen-it.de/pub.txt // """"""""""" {pgp fingerprint} A891 3D55 5F2E 3A74 3965 B997 3EF2 8B0A BC02 DA2A --5ql225fvnxdihlnt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEqJE9VV8uOnQ5ZbmXPvKLCrwC2ioFAmCM/hoACgkQPvKLCrwC 2iqErwf/YtIhQOzr2XBhq0+jvAfUWZ4mRJQvZMxQVTyaH12+q8uAuNx7PdB2RH7l v4AJO9NPhAom72XEf9DGSXCZsf3VvZOfyprCM5dpWvE6SKFrFK/GwEaJ3mQpWJW8 n3O61+3G/pnQGVk9onkeuY/Iro15vxmBgtdY7V9W5HJUXnMABXqrszHxH50RyBPC t2jvXovayki5cQXGfTtqRIWsv0FaEv6VJbbwWHAUrK4ErtN+sOxE45ykuoSSCcKL wa7NnjqrEvJWdUZNlSFs9scBJVQZD76yTQwxdusCr85g0aHAUynh8CAeJj1cjaJO 8tp+pB2a9vBc2cduLZsp7RMLo0as3w== =TvlH -----END PGP SIGNATURE----- --5ql225fvnxdihlnt--