From owner-svn-src-releng@FreeBSD.ORG Mon Oct 6 11:05:57 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 98DF71C5; Mon, 6 Oct 2014 11:05:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7AB42929; Mon, 6 Oct 2014 11:05:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s96B5vdU012318; Mon, 6 Oct 2014 11:05:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s96B5vQg012314; Mon, 6 Oct 2014 11:05:57 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201410061105.s96B5vQg012314@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 6 Oct 2014 11:05:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r272608 - releng/10.1/sys/dev/usb/controller X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Mon, 06 Oct 2014 11:05:57 -0000 Author: hselasky Date: Mon Oct 6 11:05:56 2014 New Revision: 272608 URL: https://svnweb.freebsd.org/changeset/base/272608 Log: MFC r272349, r272422 and r272479: - Fix XHCI driver for devices which have more than 15 physical root HUB ports. The current bitmap array was too small to hold more than 16 bits and would at some point toggle the context size, which then would trigger an enumeration fault and cause a fallback to the EHCI companion controller, if any. - Make sure we always set the maximum number of valid contexts. - Set default cycle state in case of early interrupts. Approved by: re, marius Modified: releng/10.1/sys/dev/usb/controller/xhci.c releng/10.1/sys/dev/usb/controller/xhci.h Directory Properties: releng/10.1/ (props changed) Modified: releng/10.1/sys/dev/usb/controller/xhci.c ============================================================================== --- releng/10.1/sys/dev/usb/controller/xhci.c Mon Oct 6 11:00:47 2014 (r272607) +++ releng/10.1/sys/dev/usb/controller/xhci.c Mon Oct 6 11:05:56 2014 (r272608) @@ -618,6 +618,10 @@ xhci_init(struct xhci_softc *sc, device_ sc->sc_bus.devices = sc->sc_devices; sc->sc_bus.devices_max = XHCI_MAX_DEVICES; + /* set default cycle state in case of early interrupts */ + sc->sc_event_ccs = 1; + sc->sc_command_ccs = 1; + /* setup command queue mutex and condition varible */ cv_init(&sc->sc_cmd_cv, "CMDQ"); sx_init(&sc->sc_cmd_sx, "CMDQ lock"); @@ -2271,14 +2275,17 @@ xhci_configure_mask(struct usb_device *u /* adjust */ x--; - /* figure out maximum */ - if (x > sc->sc_hw.devs[index].context_num) { + /* figure out the maximum number of contexts */ + if (x > sc->sc_hw.devs[index].context_num) sc->sc_hw.devs[index].context_num = x; - temp = xhci_ctx_get_le32(sc, &pinp->ctx_slot.dwSctx0); - temp &= ~XHCI_SCTX_0_CTX_NUM_SET(31); - temp |= XHCI_SCTX_0_CTX_NUM_SET(x + 1); - xhci_ctx_set_le32(sc, &pinp->ctx_slot.dwSctx0, temp); - } + else + x = sc->sc_hw.devs[index].context_num; + + /* update number of contexts */ + temp = xhci_ctx_get_le32(sc, &pinp->ctx_slot.dwSctx0); + temp &= ~XHCI_SCTX_0_CTX_NUM_SET(31); + temp |= XHCI_SCTX_0_CTX_NUM_SET(x + 1); + xhci_ctx_set_le32(sc, &pinp->ctx_slot.dwSctx0, temp); } return (0); } Modified: releng/10.1/sys/dev/usb/controller/xhci.h ============================================================================== --- releng/10.1/sys/dev/usb/controller/xhci.h Mon Oct 6 11:00:47 2014 (r272607) +++ releng/10.1/sys/dev/usb/controller/xhci.h Mon Oct 6 11:05:56 2014 (r272608) @@ -493,7 +493,8 @@ struct xhci_softc { uint8_t sc_noscratch; /* root HUB device configuration */ uint8_t sc_conf; - uint8_t sc_hub_idata[2]; + /* root HUB port event bitmap, max 256 ports */ + uint8_t sc_hub_idata[32]; /* size of context */ uint8_t sc_ctx_is_64_byte; From owner-svn-src-releng@FreeBSD.ORG Mon Oct 6 12:08:15 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 470A5302; Mon, 6 Oct 2014 12:08:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 32EA8FA4; Mon, 6 Oct 2014 12:08:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s96C8FON040864; Mon, 6 Oct 2014 12:08:15 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s96C8FAl040863; Mon, 6 Oct 2014 12:08:15 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201410061208.s96C8FAl040863@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 6 Oct 2014 12:08:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r272611 - releng/10.1/usr.bin/sort X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Mon, 06 Oct 2014 12:08:15 -0000 Author: bapt Date: Mon Oct 6 12:08:14 2014 New Revision: 272611 URL: https://svnweb.freebsd.org/changeset/base/272611 Log: MFC: r272398 Make sure to not skip any argument when converting from deprecated +POS1, -POS2 to -kPOS1,POS2, so that sort +0n gets translated to sort -k1,1n as it is expected PR: 193994 Submitted by: rodrigo Approved by: re (marius) Modified: releng/10.1/usr.bin/sort/sort.c Directory Properties: releng/10.1/ (props changed) Modified: releng/10.1/usr.bin/sort/sort.c ============================================================================== --- releng/10.1/usr.bin/sort/sort.c Mon Oct 6 11:29:50 2014 (r272610) +++ releng/10.1/usr.bin/sort/sort.c Mon Oct 6 12:08:14 2014 (r272611) @@ -897,7 +897,7 @@ fix_obsolete_keys(int *argc, char **argv } } } - sprintf(sopt, "-k%d.%d", f1, c1); + sprintf(sopt, "-k%d.%d%s", f1, c1, sopts1); argv[i] = sort_strdup(sopt); } } From owner-svn-src-releng@FreeBSD.ORG Mon Oct 6 12:08:48 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C1A0C433; Mon, 6 Oct 2014 12:08:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 93732FAD; Mon, 6 Oct 2014 12:08:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s96C8mUk040998; Mon, 6 Oct 2014 12:08:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s96C8mnY040996; Mon, 6 Oct 2014 12:08:48 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201410061208.s96C8mnY040996@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 6 Oct 2014 12:08:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r272612 - releng/10.1/sys/dev/usb X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Mon, 06 Oct 2014 12:08:48 -0000 Author: hselasky Date: Mon Oct 6 12:08:47 2014 New Revision: 272612 URL: https://svnweb.freebsd.org/changeset/base/272612 Log: MFC r272480: When we fail to get a USB reference we should just return, because there are no more references held. Approved by: re, marius Modified: releng/10.1/sys/dev/usb/usb_dev.c Directory Properties: releng/10.1/ (props changed) Modified: releng/10.1/sys/dev/usb/usb_dev.c ============================================================================== --- releng/10.1/sys/dev/usb/usb_dev.c Mon Oct 6 12:08:14 2014 (r272611) +++ releng/10.1/sys/dev/usb/usb_dev.c Mon Oct 6 12:08:47 2014 (r272612) @@ -299,6 +299,10 @@ error: } mtx_unlock(&usb_ref_lock); DPRINTFN(2, "fail\n"); + + /* clear all refs */ + memset(crd, 0, sizeof(*crd)); + return (USB_ERR_INVAL); } @@ -1094,8 +1098,8 @@ usb_ioctl(struct cdev *dev, u_long cmd, goto done; if (usb_usb_ref_device(cpd, &refs)) { - err = ENXIO; - goto done; + /* we lost the reference */ + return (ENXIO); } err = (f->methods->f_ioctl_post) (f, cmd, addr, fflags); @@ -1118,9 +1122,8 @@ usb_ioctl(struct cdev *dev, u_long cmd, while (usb_ref_device(cpd, &refs, 1 /* need uref */)) { if (usb_ref_device(cpd, &refs, 0)) { - /* device no longer exits */ - err = ENXIO; - goto done; + /* device no longer exists */ + return (ENXIO); } usb_unref_device(cpd, &refs); usb_pause_mtx(NULL, hz / 128); @@ -1412,9 +1415,9 @@ usb_read(struct cdev *dev, struct uio *u return (err); err = usb_ref_device(cpd, &refs, 0 /* no uref */ ); - if (err) { + if (err) return (ENXIO); - } + fflags = cpd->fflags; f = refs.rxfifo; @@ -1538,9 +1541,9 @@ usb_write(struct cdev *dev, struct uio * return (err); err = usb_ref_device(cpd, &refs, 0 /* no uref */ ); - if (err) { + if (err) return (ENXIO); - } + fflags = cpd->fflags; f = refs.txfifo; From owner-svn-src-releng@FreeBSD.ORG Mon Oct 6 20:38:56 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E5F7FE5; Mon, 6 Oct 2014 20:38:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 523386C3; Mon, 6 Oct 2014 20:38:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s96KcuhX094888; Mon, 6 Oct 2014 20:38:56 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s96KcuIL094887; Mon, 6 Oct 2014 20:38:56 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201410062038.s96KcuIL094887@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 6 Oct 2014 20:38:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r272669 - releng/10.1/sys/dev/iscsi_initiator X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Mon, 06 Oct 2014 20:38:56 -0000 Author: mav Date: Mon Oct 6 20:38:55 2014 New Revision: 272669 URL: https://svnweb.freebsd.org/changeset/base/272669 Log: MFC r272308: Fix old iSCSI initiator to work with new CAM locking. This switches code to using xpt_rescan() routine, irrelevant to locking. Using xpt_action() directly requires knowledge about higher level locks, that SIM does not need to have. This code is obsolete, but that is not a reason to crash. Approved by: re (marius) Modified: releng/10.1/sys/dev/iscsi_initiator/isc_cam.c Directory Properties: releng/10.1/ (props changed) Modified: releng/10.1/sys/dev/iscsi_initiator/isc_cam.c ============================================================================== --- releng/10.1/sys/dev/iscsi_initiator/isc_cam.c Mon Oct 6 18:16:45 2014 (r272668) +++ releng/10.1/sys/dev/iscsi_initiator/isc_cam.c Mon Oct 6 20:38:55 2014 (r272669) @@ -125,7 +125,7 @@ scan_callback(struct cam_periph *periph, debug_called(8); - free(ccb, M_TEMP); + xpt_free_ccb(ccb); if(sp->flags & ISC_SCANWAIT) { sp->flags &= ~ISC_SCANWAIT; @@ -141,30 +141,15 @@ ic_scan(isc_session_t *sp) debug_called(8); sdebug(2, "scanning sid=%d", sp->sid); - if((ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO)) == NULL) { - xdebug("scan failed (can't allocate CCB)"); - return ENOMEM; // XXX - } - sp->flags &= ~ISC_CAMDEVS; sp->flags |= ISC_SCANWAIT; - CAM_LOCK(sp); - if(xpt_create_path(&sp->cam_path, NULL, cam_sim_path(sp->cam_sim), - 0, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { - xdebug("can't create cam path"); - CAM_UNLOCK(sp); - free(ccb, M_TEMP); - return ENODEV; // XXX - } - xpt_setup_ccb(&ccb->ccb_h, sp->cam_path, 5/*priority (low)*/); - ccb->ccb_h.func_code = XPT_SCAN_BUS; + ccb = xpt_alloc_ccb(); + ccb->ccb_h.path = sp->cam_path; ccb->ccb_h.cbfcnp = scan_callback; - ccb->crcn.flags = CAM_FLAG_NONE; ccb->ccb_h.spriv_ptr0 = sp; - xpt_action(ccb); - CAM_UNLOCK(sp); + xpt_rescan(ccb); while(sp->flags & ISC_SCANWAIT) tsleep(sp, PRIBIO, "ffp", 5*hz); // the timeout time should @@ -374,6 +359,16 @@ ic_init(isc_session_t *sp) return ENXIO; } sp->cam_sim = sim; + if(xpt_create_path(&sp->cam_path, NULL, cam_sim_path(sp->cam_sim), + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { + xpt_bus_deregister(cam_sim_path(sp->cam_sim)); + cam_sim_free(sim, /*free_devq*/TRUE); + CAM_UNLOCK(sp); +#if __FreeBSD_version >= 700000 + mtx_destroy(&sp->cam_mtx); +#endif + return ENXIO; + } CAM_UNLOCK(sp); sdebug(1, "cam subsystem initialized"); From owner-svn-src-releng@FreeBSD.ORG Tue Oct 7 08:23:38 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 35F2B77D; Tue, 7 Oct 2014 08:23:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1738DA75; Tue, 7 Oct 2014 08:23:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s978NbuJ038039; Tue, 7 Oct 2014 08:23:37 GMT (envelope-from rodrigc@FreeBSD.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s978Nb8s038037; Tue, 7 Oct 2014 08:23:37 GMT (envelope-from rodrigc@FreeBSD.org) Message-Id: <201410070823.s978Nb8s038037@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigc set sender to rodrigc@FreeBSD.org using -f From: Craig Rodrigues Date: Tue, 7 Oct 2014 08:23:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r272682 - releng/10.1/bin/pkill/tests X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Tue, 07 Oct 2014 08:23:38 -0000 Author: rodrigc Date: Tue Oct 7 08:23:37 2014 New Revision: 272682 URL: https://svnweb.freebsd.org/changeset/base/272682 Log: MFC r272549: Fix pkill unit test Approved by: re (gjb) Modified: releng/10.1/bin/pkill/tests/pgrep-j_test.sh releng/10.1/bin/pkill/tests/pkill-j_test.sh Directory Properties: releng/10.1/ (props changed) Modified: releng/10.1/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- releng/10.1/bin/pkill/tests/pgrep-j_test.sh Tue Oct 7 08:19:21 2014 (r272681) +++ releng/10.1/bin/pkill/tests/pgrep-j_test.sh Tue Oct 7 08:23:37 2014 (r272682) @@ -1,7 +1,23 @@ #!/bin/sh # $FreeBSD$ -base=`basename $0` +jail_name_to_jid() +{ + local check_name="$1" + ( + line="$(jls -n 2> /dev/null | grep name=$check_name )" + for nv in $line; do + local name="${nv%=*}" + if [ "${name}" = "jid" ]; then + eval $nv + echo $jid + break + fi + done + ) +} + +base=pgrep_j_test echo "1..3" @@ -9,21 +25,25 @@ name="pgrep -j " if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! - $sleep 5 & - chpid3=$! - sleep 0.5 - jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"` - pid=`pgrep -f -j $jid $sleep` - if [ "$pid" = "$chpid" ]; then + jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & + + jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & + + jid1=$(jail_name_to_jid ${base}_1_1) + jid2=$(jail_name_to_jid ${base}_1_2) + jid="${jid1},${jid2}" + pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)" + pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ + $(cat ${PWD}/${base}_1_2.pid) | sort) + if [ "$pid1" = "$pid2" ]; then echo "ok 1 - $name" else echo "not ok 1 - $name" fi - kill $chpid $chpid2 $chpid3 + [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) + [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) rm -f $sleep else echo "ok 1 - $name # skip Test needs uid 0." @@ -33,21 +53,23 @@ name="pgrep -j any" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! - $sleep 5 & - chpid3=$! - sleep 0.5 - pids=`pgrep -f -j any $sleep | sort` - refpids=`{ echo $chpid; echo $chpid2; } | sort` - if [ "$pids" = "$refpids" ]; then + jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & + + jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & + + sleep 2 + pid1="$(pgrep -f -x -j any "$sleep 5" | sort)" + pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ + $(cat ${PWD}/${base}_2_2.pid) | sort) + if [ "$pid1" = "$pid2" ]; then echo "ok 2 - $name" else echo "not ok 2 - $name" fi - kill $chpid $chpid2 $chpid3 + [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) + [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) rm -f $sleep else echo "ok 2 - $name # skip Test needs uid 0." @@ -57,19 +79,19 @@ name="pgrep -j none" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - $sleep 5 & - chpid=$! - jail / $base 127.0.0.1 $sleep 5 & - chpid2=$! - sleep 0.5 - pid=`pgrep -f -j none $sleep` - if [ "$pid" = "$chpid" ]; then + daemon -p ${PWD}/${base}_3_1.pid $sleep 5 & + jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & + sleep 2 + pid="$(pgrep -f -x -j none "$sleep 5")" + if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then echo "ok 3 - $name" else echo "not ok 3 - $name" fi - kill $chpid $chpid2 rm -f $sleep + [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) + [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) else echo "ok 3 - $name # skip Test needs uid 0." fi Modified: releng/10.1/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- releng/10.1/bin/pkill/tests/pkill-j_test.sh Tue Oct 7 08:19:21 2014 (r272681) +++ releng/10.1/bin/pkill/tests/pkill-j_test.sh Tue Oct 7 08:23:37 2014 (r272682) @@ -1,7 +1,23 @@ #!/bin/sh # $FreeBSD$ -base=`basename $0` +jail_name_to_jid() +{ + local check_name="$1" + ( + line="$(jls -n 2> /dev/null | grep name=$check_name )" + for nv in $line; do + local name="${nv%=*}" + if [ "${name}" = "jid" ]; then + eval $nv + echo $jid + break + fi + done + ) +} + +base=pkill_j_test echo "1..3" @@ -9,21 +25,28 @@ name="pkill -j " if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! + jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & + + jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & + $sleep 5 & - chpid3=$! sleep 0.5 - jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"` - if pkill -f -j $jid $sleep && sleep 0.5 && - ! kill $chpid && kill $chpid2 $chpid3; then + jid1=$(jail_name_to_jid ${base}_1_1) + jid2=$(jail_name_to_jid ${base}_1_2) + jid="${jid1},${jid2}" + if pkill -f -j "$jid" $sleep && sleep 0.5 && + ! -f ${PWD}/${base}_1_1.pid && + ! -f ${PWD}/${base}_1_2.pid ; then echo "ok 1 - $name" else echo "not ok 1 - $name" fi 2>/dev/null rm -f $sleep + [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) + [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) + wait else echo "ok 1 - $name # skip Test needs uid 0." fi @@ -32,20 +55,26 @@ name="pkill -j any" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! + jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & + + jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & + $sleep 5 & - chpid3=$! sleep 0.5 + chpid3=$! if pkill -f -j any $sleep && sleep 0.5 && - ! kill $chpid && ! kill $chpid2 && kill $chpid3; then + [ ! -f ${PWD}/${base}_2_1.pid -a + ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then echo "ok 2 - $name" else echo "not ok 2 - $name" fi 2>/dev/null rm -f $sleep + [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) + [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) + wait else echo "ok 2 - $name # skip Test needs uid 0." fi @@ -54,18 +83,20 @@ name="pkill -j none" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - $sleep 5 & - chpid=$! - jail / $base 127.0.0.1 $sleep 5 & - chpid2=$! - sleep 0.5 - if pkill -f -j none $sleep && sleep 0.5 && - ! kill $chpid && kill $chpid2; then + daemon -p ${PWD}/${base}_3_1.pid $sleep 5 + jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & + sleep 1 + if pkill -f -j none "$sleep 5" && sleep 1 && + [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then echo "ok 3 - $name" else + ls ${PWD}/*.pid echo "not ok 3 - $name" fi 2>/dev/null rm -f $sleep + [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) + [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) else echo "ok 3 - $name # skip Test needs uid 0." fi From owner-svn-src-releng@FreeBSD.ORG Tue Oct 7 10:36:07 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 B1243DEB; Tue, 7 Oct 2014 10:36:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E550A4E; Tue, 7 Oct 2014 10:36:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97Aa7BA001877; Tue, 7 Oct 2014 10:36:07 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97Aa7Cd001876; Tue, 7 Oct 2014 10:36:07 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201410071036.s97Aa7Cd001876@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 7 Oct 2014 10:36:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r272684 - releng/10.1/sys/cam/ctl X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Tue, 07 Oct 2014 10:36:07 -0000 Author: mav Date: Tue Oct 7 10:36:06 2014 New Revision: 272684 URL: https://svnweb.freebsd.org/changeset/base/272684 Log: MFC r272224: Fix page length reported for Block Limits VPD page. Approved by: re (marius) Modified: releng/10.1/sys/cam/ctl/ctl.c Directory Properties: releng/10.1/ (props changed) Modified: releng/10.1/sys/cam/ctl/ctl.c ============================================================================== --- releng/10.1/sys/cam/ctl/ctl.c Tue Oct 7 10:04:25 2014 (r272683) +++ releng/10.1/sys/cam/ctl/ctl.c Tue Oct 7 10:36:06 2014 (r272684) @@ -10173,7 +10173,7 @@ ctl_inquiry_evpd_block_limits(struct ctl bl_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT; bl_ptr->page_code = SVPD_BLOCK_LIMITS; - scsi_ulto2b(sizeof(*bl_ptr), bl_ptr->page_length); + scsi_ulto2b(sizeof(*bl_ptr) - 4, bl_ptr->page_length); bl_ptr->max_cmp_write_len = 0xff; scsi_ulto4b(0xffffffff, bl_ptr->max_txfer_len); if (lun != NULL) { From owner-svn-src-releng@FreeBSD.ORG Wed Oct 8 15:39:25 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9C46EE5; Wed, 8 Oct 2014 15:39:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B5F6DFBC; Wed, 8 Oct 2014 15:39:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s98FdPfc052865; Wed, 8 Oct 2014 15:39:25 GMT (envelope-from neel@FreeBSD.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s98FdPQo052864; Wed, 8 Oct 2014 15:39:25 GMT (envelope-from neel@FreeBSD.org) Message-Id: <201410081539.s98FdPQo052864@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org using -f From: Neel Natu Date: Wed, 8 Oct 2014 15:39:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r272752 - releng/10.1/sys/kern X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 08 Oct 2014 15:39:25 -0000 Author: neel Date: Wed Oct 8 15:39:24 2014 New Revision: 272752 URL: https://svnweb.freebsd.org/changeset/base/272752 Log: MFC r272270: 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 ============================================================================== --- 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 = 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 != NULL) + if (dev != 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 From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 04:53:21 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92D76FB2; Thu, 9 Oct 2014 04:53: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 7D8EA105; Thu, 9 Oct 2014 04:53:21 +0000 (UTC) Received: from [64.201.244.132] (port=52449 helo=THEMADHATTER) by shxd.cx with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1XbyZA-0001z5-Pg; Wed, 08 Oct 2014 14:14:36 -0700 From: To: "'Neel Natu'" , , , References: <201410081539.s98FdPQo052864@svn.freebsd.org> In-Reply-To: <201410081539.s98FdPQo052864@svn.freebsd.org> Subject: RE: svn commit: r272752 - releng/10.1/sys/kern Date: Wed, 8 Oct 2014 21:53:14 -0700 Message-ID: <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQHn2Nfw981aZc33kCjSST8VwmWjSpv3RzKg Content-Language: en-us Sender: devin@shxd.cx Cc: dteske@FreeBSD.org 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 04:53: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 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). 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 > ========================================================== > ==================== > --- 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 = 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 != NULL) > + if (dev != 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 From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 05:47:29 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 85202D1D; Thu, 9 Oct 2014 05:47:29 +0000 (UTC) Received: from mail-qg0-x22f.google.com (mail-qg0-x22f.google.com [IPv6:2607:f8b0:400d:c04::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0419B7D0; Thu, 9 Oct 2014 05:47:28 +0000 (UTC) Received: by mail-qg0-f47.google.com with SMTP id i50so597107qgf.6 for ; Wed, 08 Oct 2014 22:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=gWUgsWNyr2J/b8/RK1MJROMjYN6wSXrW6vQYQB3zTwQ=; b=z1DbtiWiyEfnyql5SpFwQ7W66F1eEtobjskgyaLUKBFRyky7Tif1e5q2P+ys368aFa Y2xSfE7rVUnlCEQ8rg268S6eUTxbi4CWXREB3Uzpyy1k9Gwu8sVNAt6uPrh/pZJsmaht WBd0znlDyz+Q9RR9GvmIVN0NiwsHKCufKnjpHs45WNaecO68908aCV5cd58QUd0ze3TC s7JAnoUe4CPoecCCHnFSsZ7pZnjE98vu5a3QOCsKsGzhlwIJo9dfevQdaDwOgzk/WFHu Ue3lJ/1tSgfJl9gH2q9/C3ITRS3kHPgvPc+4sG+xuFwNRNVG0dr/fAuA1odAWXMPltoR KVaA== MIME-Version: 1.0 X-Received: by 10.140.39.240 with SMTP id v103mr50793733qgv.23.1412833648107; Wed, 08 Oct 2014 22:47:28 -0700 (PDT) Received: by 10.140.85.83 with HTTP; Wed, 8 Oct 2014 22:47:28 -0700 (PDT) In-Reply-To: <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> References: <201410081539.s98FdPQo052864@svn.freebsd.org> <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> Date: Wed, 8 Oct 2014 22:47:28 -0700 Message-ID: Subject: Re: svn commit: r272752 - releng/10.1/sys/kern From: Neel Natu To: dteske@freebsd.org Content-Type: text/plain; charset=UTF-8 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 05:47:29 -0000 Hi Devin, 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). > The svn command used to do the merge was: # svn merge -c 272726 ^/stable/10 releng/10.1 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 The commit message used "MFC r272270" because that was the origin of the change and has the full details about the patch. best Neel > 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 >> ========================================================== >> ==================== >> --- 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 = 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 != NULL) >> + if (dev != 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 > > 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 > > > > From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 13:36:38 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7D64259; Thu, 9 Oct 2014 13:36:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2DA9DCF; Thu, 9 Oct 2014 13:36:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99Dacb9087769; Thu, 9 Oct 2014 13:36:38 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99DacF7087767; Thu, 9 Oct 2014 13:36:38 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201410091336.s99DacF7087767@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Thu, 9 Oct 2014 13:36:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r272819 - releng/10.1/usr.bin/mkimg X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 13:36:39 -0000 Author: marcel Date: Thu Oct 9 13:36:37 2014 New Revision: 272819 URL: https://svnweb.freebsd.org/changeset/base/272819 Log: MF10 r272773: Add QCOW v1 & v2 support Requested by: gjb@ Approved by: re (marius) Relnotes: yes Added: releng/10.1/usr.bin/mkimg/qcow.c - copied unchanged from r272773, stable/10/usr.bin/mkimg/qcow.c Modified: releng/10.1/usr.bin/mkimg/Makefile Directory Properties: releng/10.1/ (props changed) Modified: releng/10.1/usr.bin/mkimg/Makefile ============================================================================== --- releng/10.1/usr.bin/mkimg/Makefile Thu Oct 9 12:54:56 2014 (r272818) +++ releng/10.1/usr.bin/mkimg/Makefile Thu Oct 9 13:36:37 2014 (r272819) @@ -8,6 +8,7 @@ CFLAGS+=-DSPARSE_WRITE # List of formats to support SRCS+= \ + qcow.c \ raw.c \ vhd.c \ vmdk.c Copied: releng/10.1/usr.bin/mkimg/qcow.c (from r272773, stable/10/usr.bin/mkimg/qcow.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/10.1/usr.bin/mkimg/qcow.c Thu Oct 9 13:36:37 2014 (r272819, copy of r272773, stable/10/usr.bin/mkimg/qcow.c) @@ -0,0 +1,369 @@ +/*- + * Copyright (c) 2014 Marcel Moolenaar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "image.h" +#include "format.h" +#include "mkimg.h" + +/* Default cluster sizes. */ +#define QCOW1_CLSTR_LOG2SZ 12 /* 4KB */ +#define QCOW2_CLSTR_LOG2SZ 16 /* 64KB */ + +/* Flag bits in cluster offsets */ +#define QCOW_CLSTR_COMPRESSED (1ULL << 62) +#define QCOW_CLSTR_COPIED (1ULL << 63) + +struct qcow_header { + uint32_t magic; +#define QCOW_MAGIC 0x514649fb + uint32_t version; +#define QCOW_VERSION_1 1 +#define QCOW_VERSION_2 2 + uint64_t path_offset; + uint32_t path_length; + uint32_t clstr_log2sz; /* v2 only */ + uint64_t disk_size; + union { + struct { + uint8_t clstr_log2sz; + uint8_t l2_log2sz; + uint16_t _pad; + uint32_t encryption; + uint64_t l1_offset; + } v1; + struct { + uint32_t encryption; + uint32_t l1_entries; + uint64_t l1_offset; + uint64_t refcnt_offset; + uint32_t refcnt_entries; + uint32_t snapshot_count; + uint64_t snapshot_offset; + } v2; + } u; +}; + +static u_int clstr_log2sz; + +static uint64_t +round_clstr(uint64_t ofs) +{ + uint64_t clstrsz; + + clstrsz = 1UL << clstr_log2sz; + return ((ofs + clstrsz - 1) & ~(clstrsz - 1)); +} + +static int +qcow_resize(lba_t imgsz, u_int version) +{ + uint64_t imagesz; + + switch (version) { + case QCOW_VERSION_1: + clstr_log2sz = QCOW1_CLSTR_LOG2SZ; + break; + case QCOW_VERSION_2: + clstr_log2sz = QCOW2_CLSTR_LOG2SZ; + break; + default: + return (EDOOFUS); + } + + imagesz = round_clstr(imgsz * secsz); + + if (verbose) + fprintf(stderr, "QCOW: image size = %ju, cluster size = %u\n", + (uintmax_t)imagesz, (u_int)(1U << clstr_log2sz)); + + return (image_set_size(imagesz / secsz)); +} + +static int +qcow1_resize(lba_t imgsz) +{ + + return (qcow_resize(imgsz, QCOW_VERSION_1)); +} + +static int +qcow2_resize(lba_t imgsz) +{ + + return (qcow_resize(imgsz, QCOW_VERSION_2)); +} + +static int +qcow_write(int fd, u_int version) +{ + struct qcow_header *hdr; + uint64_t *l1tbl, *l2tbl, *rctbl; + uint16_t *rcblk; + uint64_t clstr_imgsz, clstr_l2tbls, clstr_l1tblsz; + uint64_t clstr_rcblks, clstr_rctblsz; + uint64_t n, imagesz, nclstrs, ofs, ofsflags; + lba_t blk, blkofs, blk_imgsz; + u_int l1clno, l2clno, rcclno; + u_int blk_clstrsz; + u_int clstrsz, l1idx, l2idx; + int error; + + if (clstr_log2sz == 0) + return (EDOOFUS); + + clstrsz = 1U << clstr_log2sz; + blk_clstrsz = clstrsz / secsz; + blk_imgsz = image_get_size(); + imagesz = blk_imgsz * secsz; + clstr_imgsz = imagesz >> clstr_log2sz; + clstr_l2tbls = round_clstr(clstr_imgsz * 8) >> clstr_log2sz; + clstr_l1tblsz = round_clstr(clstr_l2tbls * 8) >> clstr_log2sz; + nclstrs = clstr_imgsz + clstr_l2tbls + clstr_l1tblsz + 1; + clstr_rcblks = clstr_rctblsz = 0; + do { + n = clstr_rcblks + clstr_rctblsz; + clstr_rcblks = round_clstr((nclstrs + n) * 2) >> clstr_log2sz; + clstr_rctblsz = round_clstr(clstr_rcblks * 8) >> clstr_log2sz; + } while (n < (clstr_rcblks + clstr_rctblsz)); + + /* + * We got all the sizes in clusters. Start the layout. + * 0 - header + * 1 - L1 table + * 2 - RC table (v2 only) + * 3 - L2 tables + * 4 - RC block (v2 only) + * 5 - data + */ + + l1clno = 1; + rcclno = 0; + rctbl = l2tbl = l1tbl = NULL; + rcblk = NULL; + + hdr = calloc(1, clstrsz); + if (hdr == NULL) + return (errno); + + be32enc(&hdr->magic, QCOW_MAGIC); + be32enc(&hdr->version, version); + be64enc(&hdr->disk_size, imagesz); + switch (version) { + case QCOW_VERSION_1: + ofsflags = 0; + l2clno = l1clno + clstr_l1tblsz; + hdr->u.v1.clstr_log2sz = clstr_log2sz; + hdr->u.v1.l2_log2sz = clstr_log2sz - 3; + be64enc(&hdr->u.v1.l1_offset, clstrsz * l1clno); + break; + case QCOW_VERSION_2: + ofsflags = QCOW_CLSTR_COPIED; + rcclno = l1clno + clstr_l1tblsz; + l2clno = rcclno + clstr_rctblsz; + be32enc(&hdr->clstr_log2sz, clstr_log2sz); + be32enc(&hdr->u.v2.l1_entries, clstr_l2tbls); + be64enc(&hdr->u.v2.l1_offset, clstrsz * l1clno); + be64enc(&hdr->u.v2.refcnt_offset, clstrsz * rcclno); + be32enc(&hdr->u.v2.refcnt_entries, clstr_rcblks); + break; + default: + return (EDOOFUS); + } + + if (sparse_write(fd, hdr, clstrsz) < 0) { + error = errno; + goto out; + } + + free(hdr); + hdr = NULL; + + ofs = clstrsz * l2clno; + nclstrs = 1 + clstr_l1tblsz + clstr_rctblsz; + + l1tbl = calloc(1, clstrsz * clstr_l1tblsz); + if (l1tbl == NULL) { + error = ENOMEM; + goto out; + } + + for (n = 0; n < clstr_imgsz; n++) { + blk = n * blk_clstrsz; + if (image_data(blk, blk_clstrsz)) { + nclstrs++; + l1idx = n >> (clstr_log2sz - 3); + if (l1tbl[l1idx] == 0) { + be64enc(l1tbl + l1idx, ofs + ofsflags); + ofs += clstrsz; + nclstrs++; + } + } + } + + if (sparse_write(fd, l1tbl, clstrsz * clstr_l1tblsz) < 0) { + error = errno; + goto out; + } + + clstr_rcblks = 0; + do { + n = clstr_rcblks; + clstr_rcblks = round_clstr((nclstrs + n) * 2) >> clstr_log2sz; + } while (n < clstr_rcblks); + + if (rcclno > 0) { + rctbl = calloc(1, clstrsz * clstr_rctblsz); + if (rctbl == NULL) { + error = ENOMEM; + goto out; + } + for (n = 0; n < clstr_rcblks; n++) { + be64enc(rctbl + n, ofs); + ofs += clstrsz; + nclstrs++; + } + if (sparse_write(fd, rctbl, clstrsz * clstr_rctblsz) < 0) { + error = errno; + goto out; + } + free(rctbl); + rctbl = NULL; + } + + l2tbl = malloc(clstrsz); + if (l2tbl == NULL) { + error = ENOMEM; + goto out; + } + + for (l1idx = 0; l1idx < clstr_l2tbls; l1idx++) { + if (l1tbl[l1idx] == 0) + continue; + memset(l2tbl, 0, clstrsz); + blkofs = (lba_t)l1idx * blk_clstrsz * (clstrsz >> 3); + for (l2idx = 0; l2idx < (clstrsz >> 3); l2idx++) { + blk = blkofs + (lba_t)l2idx * blk_clstrsz; + if (blk >= blk_imgsz) + break; + if (image_data(blk, blk_clstrsz)) { + be64enc(l2tbl + l2idx, ofs + ofsflags); + ofs += clstrsz; + } + } + if (sparse_write(fd, l2tbl, clstrsz) < 0) { + error = errno; + goto out; + } + } + + free(l2tbl); + l2tbl = NULL; + free(l1tbl); + l1tbl = NULL; + + if (rcclno > 0) { + rcblk = calloc(1, clstrsz * clstr_rcblks); + if (rcblk == NULL) { + error = ENOMEM; + goto out; + } + for (n = 0; n < nclstrs; n++) + be16enc(rcblk + n, 1); + if (sparse_write(fd, rcblk, clstrsz * clstr_rcblks) < 0) { + error = errno; + goto out; + } + free(rcblk); + rcblk = NULL; + } + + error = 0; + for (n = 0; n < clstr_imgsz; n++) { + blk = n * blk_clstrsz; + if (image_data(blk, blk_clstrsz)) { + error = image_copyout_region(fd, blk, blk_clstrsz); + if (error) + break; + } + } + if (!error) + error = image_copyout_done(fd); + + out: + if (rcblk != NULL) + free(rcblk); + if (l2tbl != NULL) + free(l2tbl); + if (rctbl != NULL) + free(rctbl); + if (l1tbl != NULL) + free(l1tbl); + if (hdr != NULL) + free(hdr); + return (error); +} + +static int +qcow1_write(int fd) +{ + + return (qcow_write(fd, QCOW_VERSION_1)); +} + +static int +qcow2_write(int fd) +{ + + return (qcow_write(fd, QCOW_VERSION_2)); +} + +static struct mkimg_format qcow1_format = { + .name = "qcow", + .description = "QEMU Copy-On-Write, version 1", + .resize = qcow1_resize, + .write = qcow1_write, +}; +FORMAT_DEFINE(qcow1_format); + +static struct mkimg_format qcow2_format = { + .name = "qcow2", + .description = "QEMU Copy-On-Write, version 2", + .resize = qcow2_resize, + .write = qcow2_write, +}; +FORMAT_DEFINE(qcow2_format); From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 16:00:38 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 653F9B2E; Thu, 9 Oct 2014 16:00:38 +0000 (UTC) Received: from mail-wi0-x236.google.com (mail-wi0-x236.google.com [IPv6:2a00:1450:400c:c05::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61CFB1F2; Thu, 9 Oct 2014 16:00:37 +0000 (UTC) Received: by mail-wi0-f182.google.com with SMTP id n3so2268891wiv.3 for ; Thu, 09 Oct 2014 09:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=L3UrB9f6IUE1VY70x72zLKrXyXdeaFU5sqQ4QQS69uE=; b=B6TFBXmXRpC7rfqcTMPHDf7TgvWbTyRVGoLlCub66EN2i13TD1fMnDIyV6XGExDmGp ykYq4LPF/j3J3qJEILES/X3gH5HjhUWAVE9KQQyhxK/lu/lf2FsHoPUVzMf3Gq4ZIvOS mLft+3mcgOJTndAu4IB4ddCACYVXsFrWR7kFzIxHy8SF1DX/F4dAobGL1DgBgrmY+Ozw v6nzS509/ggTnn/PPK2wnKbH60jG9PKnGUQwK2oYfvniUSRNt072Suz/iObg7NPHeq/a oQ9ejZcod2hQvNC/Z21JTCi8n1hYjiEFyyZyLKjuuerrfgSgQsMEBWhsCfPcWmaYzQx9 lWVg== MIME-Version: 1.0 X-Received: by 10.194.71.229 with SMTP id y5mr5170369wju.129.1412870435602; Thu, 09 Oct 2014 09:00:35 -0700 (PDT) Received: by 10.27.12.156 with HTTP; Thu, 9 Oct 2014 09:00:35 -0700 (PDT) In-Reply-To: <2b3301cfe39b$f2ae29d0$d80a7d70$@FreeBSD.org> References: <201410081539.s98FdPQo052864@svn.freebsd.org> <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> <2b3301cfe39b$f2ae29d0$d80a7d70$@FreeBSD.org> Date: Thu, 9 Oct 2014 09:00:35 -0700 Message-ID: Subject: Re: svn commit: r272752 - releng/10.1/sys/kern From: Neel Natu To: dteske@freebsd.org Content-Type: text/plain; charset=UTF-8 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 16:00:38 -0000 Hi Devin, On Thu, Oct 9, 2014 at 1:35 AM, 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 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 >> >> Hi Devin, >> >> 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). >> > >> >> The svn command used to do the merge was: >> # svn merge -c 272726 ^/stable/10 releng/10.1 >> >> 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 >> > > 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. > I don't agree - the commit message is entirely self-consistent but I see why you might think otherwise. FWIW here is an analysis of all commits into releng/10.1. There are six commits with a commit message of "MFC ": https://svnweb.freebsd.org/changeset/base/272684 https://svnweb.freebsd.org/changeset/base/272669 https://svnweb.freebsd.org/changeset/base/272612 https://svnweb.freebsd.org/changeset/base/272611 https://svnweb.freebsd.org/changeset/base/272608 https://svnweb.freebsd.org/changeset/base/272752 There is one commit with a commit message of "MFC ": https://svnweb.freebsd.org/changeset/base/272682 There is one commit with a commit message of "MF10 ": https://svnweb.freebsd.org/changeset/base/272819 Clearly there are different styles used by developers but the numbers suggest that "MFC " is the preferred one. best Neel >> The commit message used "MFC r272270" because that was the origin of >> the change and has the full details about the patch. >> > > 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. > -- > 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 >> >> > 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 >> >> >> ========================================================== >> >> ==================== >> >> --- 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 = 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 != NULL) >> >> + if (dev != 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 >> > >> > > > From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 16:43:43 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D45F8CF; Thu, 9 Oct 2014 16:43:43 +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 33D739FA; Thu, 9 Oct 2014 16:43:43 +0000 (UTC) Received: from [64.201.244.132] (port=57277 helo=THEMADHATTER) by shxd.cx with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1Xc9er-0007Wl-F5; Thu, 09 Oct 2014 02:05:13 -0700 From: To: "'Neel Natu'" , References: <201410081539.s98FdPQo052864@svn.freebsd.org> <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> <2b3301cfe39b$f2ae29d0$d80a7d70$@FreeBSD.org> In-Reply-To: Subject: RE: svn commit: r272752 - releng/10.1/sys/kern Date: Thu, 9 Oct 2014 09:43:29 -0700 Message-ID: <2c4401cfe3e0$2abf3ff0$803dbfd0$@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/AovFIpkCcGTyOALG8FdFm6q38xA= 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 16:43:43 -0000 Hi Neel, > -----Original Message----- > From: Neel Natu [mailto:neelnatu@gmail.com] > Sent: Thursday, October 9, 2014 9:01 AM > 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 Thu, Oct 9, 2014 at 1:35 AM, 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 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 > >> > >> Hi Devin, > >> > >> 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). > >> > > >> > >> The svn command used to do the merge was: > >> # svn merge -c 272726 ^/stable/10 releng/10.1 > >> > >> 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 > >> > > > > 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. > > >=20 > I don't agree - the commit message is entirely self-consistent but I > see why you might think otherwise. >=20 > FWIW here is an analysis of all commits into releng/10.1. >=20 > There are six commits with a commit message of "MFC ": > https://svnweb.freebsd.org/changeset/base/272684 > https://svnweb.freebsd.org/changeset/base/272669 > https://svnweb.freebsd.org/changeset/base/272612 > https://svnweb.freebsd.org/changeset/base/272611 > https://svnweb.freebsd.org/changeset/base/272608 > https://svnweb.freebsd.org/changeset/base/272752 >=20 > There is one commit with a commit message of "MFC = ": > https://svnweb.freebsd.org/changeset/base/272682 >=20 > There is one commit with a commit message of "MF10 > ": > https://svnweb.freebsd.org/changeset/base/272819 >=20 > Clearly there are different styles used by developers but the numbers > suggest that "MFC " is the preferred one. >=20 > best > Neel >=20 [Devin Teske]=20 Thank you for the recent sampling. I was extrapolating more from a longer experience encompassing multiple releases, and -- thanks to your recent poll -- it looks like what I have often deemed "the better acronyms" are falling out-of-use. ;( It would appear as though commits into lower branches are describing the intent of the commit, not the letter of the commit. Or in other words, I've always tried to make my commit messages (because I've found others whom have done-so have a laudable history with the project) reflect the action of the commit (MFS if merging from stable; MFV if merging from vendor/contrib, etc.) rather than reflect the higher-level meaning of the commit (which will almost always be MFC, except perhaps if say merging from project space; MFP). I believe I have observed waxing and waning use of these acronyms, and your recent poll shows a current waning trend; however I wish more commits would: a. describe the individual action in the message rather than the over-arching, higer-level action b. Use these acronyms more If there is strong number of yay's that agree, perhaps maybe even an addendum or slight modification to the committer's guide? --=20 Devin > >> The commit message used "MFC r272270" because that was the origin = of > >> the change and has the full details about the patch. > >> > > > > 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. > > -- > > 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 > >> > >> > 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 > >> > > >> > > > > > From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 18:32:24 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 A99624EB; Thu, 9 Oct 2014 18:32:24 +0000 (UTC) Received: from mail-ig0-x236.google.com (mail-ig0-x236.google.com [IPv6:2607:f8b0:4001:c05::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FB3B8B4; Thu, 9 Oct 2014 18:32:24 +0000 (UTC) Received: by mail-ig0-f182.google.com with SMTP id hn15so5276352igb.9 for ; Thu, 09 Oct 2014 11:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=wrRrMYzCyp/KVpECL8CKiC8wguacDxtdrvw6qlnLv5s=; b=qKbp3Yx6GPi0NdBf6N9N4E1g8jVYoZ7MbVcFcEvIp4fvhvVT7jg5SBO1znSAhHmOaJ bj2LrcOfVL4/xyJZ84WxYp5lrw2YpFtZjSv5Dn4GQ95N94R9bMbIkx0s0J+9OWqAd232 +V97BwDVCXfeBTsbcKcEVPPXhO4soGJ2HUP8pBefQVklvNGlueAknT1oR3o9AdmG8yAE ej/Ur5AhG5AL+d6GEjX/aAJs4F5ChPu3ltc6+glSE30edAVKL1RXoCD8461Jg5TuYYbX ETX0mDpQd7l/DPsDLZ5UqpMEhn+HmKYXLNkLnly+DPCyl2dL1fxwzhMvM5wS0Qb74OEE L2BQ== X-Received: by 10.50.142.104 with SMTP id rv8mr12193368igb.21.1412879543699; Thu, 09 Oct 2014 11:32:23 -0700 (PDT) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.29.132 with HTTP; Thu, 9 Oct 2014 11:32:03 -0700 (PDT) In-Reply-To: <2c4401cfe3e0$2abf3ff0$803dbfd0$@FreeBSD.org> References: <201410081539.s98FdPQo052864@svn.freebsd.org> <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> <2b3301cfe39b$f2ae29d0$d80a7d70$@FreeBSD.org> <2c4401cfe3e0$2abf3ff0$803dbfd0$@FreeBSD.org> From: Ed Maste Date: Thu, 9 Oct 2014 14:32:03 -0400 X-Google-Sender-Auth: 6XTMEb6tdewNtaMLVQGImBIt4Sw Message-ID: Subject: Re: svn commit: r272752 - releng/10.1/sys/kern To: Devin Teske Content-Type: text/plain; charset=UTF-8 Cc: svn-src-releng@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Neel Natu , 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 18:32:24 -0000 On 9 October 2014 12:43, wrote: > I believe I have observed waxing and waning use of > these acronyms, and your recent poll shows a current > waning trend; however I wish more commits would: > > a. describe the individual action in the message rather > than the over-arching, higer-level action > b. Use these acronyms more I think it's silly to have to manually specify metadata in a commit message which is already perfectly captured by the tool itself. The manually-entered metadata is not 100% reliable across the projects history anyway. That said, I'd be happy to help review a proposed patch to the committer's handbook or Subversion primer that documents these terms and presents examples of their use. From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 19:36:43 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0718E686; Thu, 9 Oct 2014 19:36:43 +0000 (UTC) Received: from mail-pa0-x232.google.com (mail-pa0-x232.google.com [IPv6:2607:f8b0:400e:c03::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AFACAEE3; Thu, 9 Oct 2014 19:36:42 +0000 (UTC) Received: by mail-pa0-f50.google.com with SMTP id kx10so309315pab.37 for ; Thu, 09 Oct 2014 12:36:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:mime-version:in-reply-to:content-type :content-transfer-encoding:message-id:cc:from:subject:date:to; bh=jfTQDBkN5+rMe7/XFWH5A5lny2Lk/H9dG5FxzPrDr48=; b=kfGrihDyTaDAgJ2tmxEZJRr7MKtgdbmAl0cNcV3Gken4Fb8znCIswrTXrSXP2yF0XE zeh5CrWLm2TWInrOMXtwIdHu5K9spSLjl/+WoGpoc6d4+H27NlGI+jv2WxaoQetXp4a9 a1J0hXLG4rjRTN4NdCUpow/fbxEemwyedC2jpvm3gkHUCr0mZBk58mHErBYEYn3dHT/X q1qWibGJG1Cw1Wt4isvI7+hHPxwNA7PvHbgWF13xFgT/Mq23mNzRhiHUwSzy5IG5ng8L EXkT1WDm3G/hmZuQRy2y6l0bfwRkR7L1SGD/7QLvIHCMEn4cSSV5N0wZn5m0RApjaDiP c52w== X-Received: by 10.68.220.10 with SMTP id ps10mr76712pbc.135.1412883402128; Thu, 09 Oct 2014 12:36:42 -0700 (PDT) Received: from [10.61.9.12] (mobile-166-137-212-101.mycingular.net. [166.137.212.101]) by mx.google.com with ESMTPSA id nk11sm1291421pdb.40.2014.10.09.12.36.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Oct 2014 12:36:41 -0700 (PDT) References: <201410081539.s98FdPQo052864@svn.freebsd.org> <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> <2b3301cfe39b$f2ae29d0$d80a7d70$@FreeBSD.org> <2c4401cfe3e0$2abf3ff0$803dbfd0$@FreeBSD.org> Mime-Version: 1.0 (1.0) In-Reply-To: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: X-Mailer: iPhone Mail (11D257) From: Garrett Cooper Subject: Re: svn commit: r272752 - releng/10.1/sys/kern Date: Thu, 9 Oct 2014 12:36:37 -0700 To: Ed Maste Cc: "svn-src-releng@freebsd.org" , Neel Natu , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Devin Teske , 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 19:36:43 -0000 > On Oct 9, 2014, at 11:32, Ed Maste wrote: >=20 >> On 9 October 2014 12:43, wrote: >>=20 >> I believe I have observed waxing and waning use of >> these acronyms, and your recent poll shows a current >> waning trend; however I wish more commits would: >>=20 >> a. describe the individual action in the message rather >> than the over-arching, higer-level action >> b. Use these acronyms more >=20 > I think it's silly to have to manually specify metadata in a commit > message which is already perfectly captured by the tool itself. The > manually-entered metadata is not 100% reliable across the projects > history anyway. >=20 > That said, I'd be happy to help review a proposed patch to the > committer's handbook or Subversion primer that documents these terms > and presents examples of their use. +1. Seems like a lot of drama over pedanticisms. Let me dig up the "MFC" script I have when I get home -- it automates the en= tire process. Thanks!= From owner-svn-src-releng@FreeBSD.ORG Fri Oct 10 00:24:46 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 9A44DF97; Fri, 10 Oct 2014 00:24:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8643C231; Fri, 10 Oct 2014 00:24:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9A0Oklf005905; Fri, 10 Oct 2014 00:24:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9A0OkJ9005904; Fri, 10 Oct 2014 00:24:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201410100024.s9A0OkJ9005904@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 10 Oct 2014 00:24:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r272876 - releng/10.1/sys/conf X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Fri, 10 Oct 2014 00:24:46 -0000 Author: gjb Date: Fri Oct 10 00:24:45 2014 New Revision: 272876 URL: https://svnweb.freebsd.org/changeset/base/272876 Log: Update releng/10.1 to -RC2 as part of the 10.1-RELEASE cycle. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.1/sys/conf/newvers.sh Modified: releng/10.1/sys/conf/newvers.sh ============================================================================== --- releng/10.1/sys/conf/newvers.sh Fri Oct 10 00:12:16 2014 (r272875) +++ releng/10.1/sys/conf/newvers.sh Fri Oct 10 00:24:45 2014 (r272876) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.1" -BRANCH="RC1" +BRANCH="RC2" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi