svn commit: r267683 - in stable/9/usr.sbin/bsdconfig: include share share/media share/packages

2014-06-20 Thread Devin Teske
Author: dteske Date: Fri Jun 20 17:57:29 2014 New Revision: 267683 URL: http://svnweb.freebsd.org/changeset/base/267683 Log: MFC revisions 257795,257817,257819,257937-257938,258264-258265,258267, 258854,259113,259427 (11 revisions; summarized below). r257795: Replace pkg-tools with pkgng r

svn commit: r267684 - in stable/9: . usr.sbin

2014-06-20 Thread Devin Teske
Author: dteske Date: Fri Jun 20 18:07:04 2014 New Revision: 267684 URL: http://svnweb.freebsd.org/changeset/base/267684 Log: Add missing mergeinfo for 267683. Modified: Directory Properties: stable/9/ (props changed) stable/9/usr.sbin/ (props changed) ___

svn commit: r267686 - stable/9/release/doc/en_US.ISO8859-1/errata

2014-06-20 Thread Glen Barber
Author: gjb Date: Fri Jun 20 19:57:55 2014 New Revision: 267686 URL: http://svnweb.freebsd.org/changeset/base/267686 Log: Document missing SAs on the 9.2R errata page. Submitted by: pi Sponsored by: The FreeBSD Foundation Modified: stable/9/release/doc/en_US.ISO8859-1/errata/article.xm

Re: svn commit: r267684 - in stable/9: . usr.sbin

2014-06-20 Thread Glen Barber
On Fri, Jun 20, 2014 at 06:07:05PM +, Devin Teske wrote: > Author: dteske > Date: Fri Jun 20 18:07:04 2014 > New Revision: 267684 > URL: http://svnweb.freebsd.org/changeset/base/267684 > > Log: > Add missing mergeinfo for 267683. > > Modified: > Directory Properties: > stable/9/ (props

svn commit: r267695 - stable/9/sys/dev/cxgbe

2014-06-20 Thread Navdeep Parhar
Author: np Date: Sat Jun 21 00:35:20 2014 New Revision: 267695 URL: http://svnweb.freebsd.org/changeset/base/267695 Log: MFC r267600: cxgbe(4): Fix bug in the fast rx buffer recycle path. In some cases rx buffers were getting recycled when they should have been left alone. Modified:

svn commit: r267696 - stable/9/release/doc/en_US.ISO8859-1/relnotes

2014-06-20 Thread Glen Barber
Author: gjb Date: Sat Jun 21 00:45:44 2014 New Revision: 267696 URL: http://svnweb.freebsd.org/changeset/base/267696 Log: Purge information from the stable/9 relnotes that applied to 9.3-RELEASE, after releng/9.3 is branched. Approved by: re (implicit) Sponsored by: The FreeBSD Foundat

Re: svn commit: r267684 - in stable/9: . usr.sbin

2014-06-20 Thread Justin Hibbits
On Fri, 20 Jun 2014 20:34:00 -0400 Glen Barber wrote: > On Fri, Jun 20, 2014 at 06:07:05PM +, Devin Teske wrote: > > Author: dteske > > Date: Fri Jun 20 18:07:04 2014 > > New Revision: 267684 > > URL: http://svnweb.freebsd.org/changeset/base/267684 > > > > Log: > > Add missing mergeinfo fo

Re: svn commit: r267684 - in stable/9: . usr.sbin

2014-06-20 Thread Glen Barber
On Fri, Jun 20, 2014 at 05:50:34PM -0700, Justin Hibbits wrote: > On Fri, 20 Jun 2014 20:34:00 -0400 > Glen Barber wrote: > > > On Fri, Jun 20, 2014 at 06:07:05PM +, Devin Teske wrote: > > > Author: dteske > > > Date: Fri Jun 20 18:07:04 2014 > > > New Revision: 267684 > > > URL: http://svnwe

RE: svn commit: r267684 - in stable/9: . usr.sbin

2014-06-20 Thread dteske
Because we've been told to only ever merge things to the root of a stable branch. I made the mistake of doing the merge in the usr.sbin/bsdconfig sub-directory (because I had not made a commit in a while). This commit was just to add the missing mergeinfo to the TLDs. In other words,... I had e

Re: svn commit: r267684 - in stable/9: . usr.sbin

2014-06-20 Thread Glen Barber
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. > Only for stable/10 and later. The stable/9 branch and earlier are merged the "old way." Glen pgpIrvV8XnPfm.pgp Description: PGP signature

RE: svn commit: r267684 - in stable/9: . usr.sbin

2014-06-20 Thread dteske
> -Original Message- > From: owner-src-committ...@freebsd.org [mailto:owner-src- > committ...@freebsd.org] On Behalf Of Glen Barber > Sent: Friday, June 20, 2014 6:26 PM > To: dte...@freebsd.org > Cc: src-committ...@freebsd.org; svn-src-...@freebsd.org; svn-src- > sta...@freebsd.org; svn-

svn commit: r267702 - in stable/9: . usr.sbin

2014-06-20 Thread Glen Barber
Author: gjb Date: Sat Jun 21 02:24:35 2014 New Revision: 267702 URL: http://svnweb.freebsd.org/changeset/base/267702 Log: Remove bogus mergeinfo introduced in r267684. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: Directory Properties: stable/9/ (props ch

Re: svn commit: r267684 - in stable/9: . usr.sbin

2014-06-20 Thread Glen Barber
On Fri, Jun 20, 2014 at 06:47:28PM -0700, Devin Teske wrote: > > > 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. > > > > > > > Only for stable/10 and later. The stable/9 branch and earlie

RE: svn commit: r267684 - in stable/9: . usr.sbin

2014-06-20 Thread dteske
> -Original Message- > From: owner-src-committ...@freebsd.org [mailto:owner-src- > committ...@freebsd.org] On Behalf Of Glen Barber > Sent: Friday, June 20, 2014 7:26 PM > To: dte...@freebsd.org > Cc: src-committ...@freebsd.org; svn-src-...@freebsd.org; svn-src- > sta...@freebsd.org; svn-