From owner-svn-src-stable@FreeBSD.ORG Sat Jun 21 01:25:52 2014 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from hub.FreeBSD.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8213ECBF; Sat, 21 Jun 2014 01:25:51 +0000 (UTC) Date: Fri, 20 Jun 2014 21:25:47 -0400 From: Glen Barber To: dteske@FreeBSD.org Subject: Re: svn commit: r267684 - in stable/9: . usr.sbin Message-ID: <20140621012547.GO1218@hub.FreeBSD.org> References: <201406201807.s5KI755X045471@svn.freebsd.org> <20140621003400.GJ1218@hub.FreeBSD.org> <01b801cf8cef$2332d500$69987f00$@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uIq33vy618f2J7at" Content-Disposition: inline In-Reply-To: <01b801cf8cef$2332d500$69987f00$@FreeBSD.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 01:25:52 -0000 --uIq33vy618f2J7at Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 20, 2014 at 06:21:32PM -0700, Devin Teske wrote: > Because we've been told to only ever merge things to the > root of a stable branch. >=20 Only for stable/10 and later. The stable/9 branch and earlier are merged the "old way." Glen --uIq33vy618f2J7at Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJTpN8bAAoJELls3eqvi17QZuwP/0Rg3QQehGYQ3TQA5enICqFo JI0rs5h1t8FZCwVqLylx8vYibpjokB4+flYmLVihB5JmGPefuG7QhOMkwGPPY+vI oFXxnvArFAVA5RZP30bbu4XTGtRHixEQE8Lrdg42fBbws0k4SSbE2SDuxzccPuVf XvzhS1GxGloRfbuKikSyvhh+FJtoEtGfRw7jlEUNc56sXe0b0NzD/9IT+IAh2rE9 29QmLBi+FjJ8aEIqOY0P5lguPPmSvNPlKLXU4eMKGTIA9n1eLoYpeXvtdbcs7OT8 ko7IG9Tv+61ysuTunMZLRJAq3xW56aI56suP/ggBR37yzsM1ZoVsR38xb0duFujf TCr0455ZNmMcC02q+Fr7MXuM6WAyx0HfWvkzRLIFtXrXk77RTN7pJHmamL8yCfZ5 vk5lr68xblU87SQEhO7FwvldXGR7UA+WRDlc5Yy4v8MlIYLA0CkwaNERQTOrd8RS a6r+oDKBB79F5zcWXpz7UnFflSulXbesVx4/kxEqvtMnGOX/CtjfSYBDyUUMK/be WKPbto0zKY9VWAdZlicMi3oVFWu7Jsy7OxgCtv/XM9DpfkBnqpupAuJzOeIVSmfF LhYJZvtmBV98wWIy/OPtbmzrfcNG4Dd3d0CZ9fNl3mK0WJWTPLvS+Onze5Hcu4X3 9z9EYY7/AcpwCXwjN0d0 =Hom4 -----END PGP SIGNATURE----- --uIq33vy618f2J7at--