From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 08:35:21 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99E3F6BC; Thu, 9 Oct 2014 08:35:21 +0000 (UTC) Received: from shxd.cx (unknown [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8246EA21; Thu, 9 Oct 2014 08:35:21 +0000 (UTC) Received: from [64.201.244.132] (port=55993 helo=THEMADHATTER) by shxd.cx with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1Xc226-0003TS-13; Wed, 08 Oct 2014 17:56:42 -0700 From: To: "'Neel Natu'" , References: <201410081539.s98FdPQo052864@svn.freebsd.org> <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> In-Reply-To: Subject: RE: svn commit: r272752 - releng/10.1/sys/kern Date: Thu, 9 Oct 2014 01:35:14 -0700 Message-ID: <2b3301cfe39b$f2ae29d0$d80a7d70$@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQHn2Nfw981aZc33kCjSST8VwmWjSgHnb9Z/AovFIpmb0+raUA== Content-Language: en-us Sender: devin@shxd.cx Cc: svn-src-releng@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, 'Neel Natu' X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Oct 2014 08:35:21 -0000 > -----Original Message----- > From: owner-src-committers@freebsd.org [mailto:owner-src- > committers@freebsd.org] On Behalf Of Neel Natu > Sent: Wednesday, October 8, 2014 10:47 PM > To: dteske@freebsd.org > Cc: Neel Natu; src-committers@freebsd.org; svn-src-all@freebsd.org; = svn- > src-releng@freebsd.org > Subject: Re: svn commit: r272752 - releng/10.1/sys/kern >=20 > Hi Devin, >=20 > On Wed, Oct 8, 2014 at 9:53 PM, wrote: > > > > > >> -----Original Message----- > >> From: owner-src-committers@freebsd.org [mailto:owner-src- > >> committers@freebsd.org] On Behalf Of Neel Natu > >> Sent: Wednesday, October 8, 2014 8:39 AM > >> To: src-committers@freebsd.org; svn-src-all@freebsd.org; svn-src- > >> releng@freebsd.org > >> Subject: svn commit: r272752 - releng/10.1/sys/kern > >> > >> Author: neel > >> Date: Wed Oct 8 15:39:24 2014 > >> New Revision: 272752 > >> URL: https://svnweb.freebsd.org/changeset/base/272752 > >> > >> Log: > >> MFC r272270: > > > > I hate to pick nits, but I believe this revision (272752 in = releng/10.1) > > should (I suggest; deferring to re@ for final prognosis) perhaps = have > > _not_ been an MFC from head (r272270; as was performed) but > > perhaps have instead been MFS from stable/10 (r272726). > > >=20 > The svn command used to do the merge was: > # svn merge -c 272726 ^/stable/10 releng/10.1 >=20 > This is exactly as per the SVN merge guidelines into releng as = documented > here: > https://www.freebsd.org/doc/en/articles/committers-guide/subversion- > primer.html >=20 Hi Neel, Nowhere in that document does it describe "MFS". I'm happy you did the merge as it was supposed to be done. However, your commit message is inaccurate. > The commit message used "MFC r272270" because that was the origin of > the change and has the full details about the patch. >=20 I don't care if the subversion primer doesn't talk about "MFS" versus "MFC", but it is technically inaccurate to call your commit an "MFC [of] r272270" because it is in-fact (as you admit) an MFS of r272726 -- which is indeed indicated by mergeinfo. Making someone look up the mergeinfo because the commit message is a inaccurate doesn't make for an efficient/predictable setup. --=20 Cheers, Devin P.S. If I was really on your case, I'd insist that you had put "MFS10 = r#" but in all reality, "MFS r#" would have been perfectly acceptable where "MFC r#" is clearly just plain wrong and misleading. > best > Neel >=20 > > The nit being that mergeinfo now shows (unnaturally) that things > > flowed from head -> stable / head -> releng versus > > head -> stable -> releng as I suggest would have been cleaner for > > historical analysis. > > -- > > Cheers, > > Devin > > > >> > >> tty_rel_free() can be called more than once for the same tty so = make > sure > >> that the tty is dequeued from 'tty_list' only the first time. > >> > >> Approved by: re (glebius) > >> > >> Modified: > >> releng/10.1/sys/kern/tty.c > >> Directory Properties: > >> releng/10.1/ (props changed) > >> > >> Modified: releng/10.1/sys/kern/tty.c > >> > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D > >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >> --- releng/10.1/sys/kern/tty.c Wed Oct 8 15:30:59 2014 = (r272751) > >> +++ releng/10.1/sys/kern/tty.c Wed Oct 8 15:39:24 2014 = (r272752) > >> @@ -1055,13 +1055,13 @@ tty_rel_free(struct tty *tp) > >> tp->t_dev =3D NULL; > >> tty_unlock(tp); > >> > >> - sx_xlock(&tty_list_sx); > >> - TAILQ_REMOVE(&tty_list, tp, t_list); > >> - tty_list_count--; > >> - sx_xunlock(&tty_list_sx); > >> - > >> - if (dev !=3D NULL) > >> + if (dev !=3D NULL) { > >> + sx_xlock(&tty_list_sx); > >> + TAILQ_REMOVE(&tty_list, tp, t_list); > >> + tty_list_count--; > >> + sx_xunlock(&tty_list_sx); > >> destroy_dev_sched_cb(dev, tty_dealloc, tp); > >> + } > >> } > >> > >> void > > > >