From owner-svn-src-all@FreeBSD.ORG Mon Oct 29 04:50:39 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 84BF9D42 for ; Mon, 29 Oct 2012 04:50:39 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id 41AE48FC08 for ; Mon, 29 Oct 2012 04:50:39 +0000 (UTC) Received: by mail-pb0-f54.google.com with SMTP id rp8so4165474pbb.13 for ; Sun, 28 Oct 2012 21:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=MO7wU5BfGeduFKU9gXBiLk0wYAvR3NBxSo237+DhXQ0=; b=Jx59Ob48s2cZnElL1XjHUzfiKmG87GIMzd+NCvtGOJflmgK9m1IFxh5ZR3e5DmZszQ Qc4j68d86GmeJQocDrvC+v2l37Dt255ZtPnJz5EBffQD3dSwl07dUzYRiX+2H4eAofyK 9er733MdkcZIYi8lzzKTJQ7ank//WCxoBMAqg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :x-gm-message-state; bh=MO7wU5BfGeduFKU9gXBiLk0wYAvR3NBxSo237+DhXQ0=; b=iZGk5t8KYZZTwG4q46+PgcHhebhCm74nCGQ6Xoi8QVhak94QS6hv2Uc/xaBjxIl85N SpzEi8LWSll3TQrO2aPWdZn7KVmUlW9PzjdC1rBX1sL0WTLgZS8E9O1jauBQbUktc/oL o87tPml5SXJAKHXshmCZPpIF6WeCZxX2O/BmhV0B+4vUJTwVViPEe9lXlWX7Uy5sF2AI qSIw7F4q3yfxOuumkW9bCB3udxp/qzRvd8WRH1sKWXWQKDex+I9pYRGBjqqh7eEhPMIV DEdRdjfDQjSzvrNhYc0CQTwhknIsJOHPvzwXzfg2riv8znxGvLOWdpYyt8AN9S6p9WZf FOVA== Received: by 10.66.84.132 with SMTP id z4mr7812077pay.63.1351486238909; Sun, 28 Oct 2012 21:50:38 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.66.161.163 with HTTP; Sun, 28 Oct 2012 21:50:08 -0700 (PDT) In-Reply-To: References: <201210290352.q9T3qJa3070064@svn.freebsd.org> <20121029043242.GH73505@kib.kiev.ua> From: Eitan Adler Date: Mon, 29 Oct 2012 00:50:08 -0400 X-Google-Sender-Auth: l96kPi8oygYfNJ89zeJ9Z5itxho Message-ID: Subject: Re: svn commit: r242283 - stable/9/sys/kern To: Konstantin Belousov Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQmea4HGAfeuvLIMcjO8yRvcPsQrnwTTnfnSRyZBhkcBpMCHJw3HqkJC9hdwXE4TBiZU/B2p 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2012 04:50:39 -0000 On 29 October 2012 00:46, Eitan Adler wrote: > On 29 October 2012 00:32, Konstantin Belousov wrote: >> On Mon, Oct 29, 2012 at 03:52:19AM +0000, Eitan Adler wrote: >>> Author: eadler >>> Date: Mon Oct 29 03:52:18 2012 >>> New Revision: 242283 >>> URL: http://svn.freebsd.org/changeset/base/242283 >>> >>> Log: >>> MFC r241855,r241859: >>> Update the kill(2) and killpg(2) man pages to the modern permission >>> checks. Also indicate killpg(2) is POSIX compliant. >>> >>> Correct the killpg(2) return values: >>> >>> Return EPERM if processes were found but they >>> were unable to be signaled. >>> >>> Return the first error from p_cansignal if no signal was successful. >>> >>> Discussed with: jilles >>> Approved by: cperciva (implicit) >>> >>> Modified: >>> stable/9/sys/kern/kern_sig.c >>> Directory Properties: >>> stable/9/sys/ (props changed) > >> According to svn mail, r241855 was not merged. > > Okay, this is weird. I am certain my original merge command included > both revisions. Looking at the email it is clear that the > documentation was not MFCed. > > If I attempt to MFC again now I see no changes. > > %svn merge -c241855 svn+ssh://svn.freebsd.org/base//head/sys stable9/sys > %svn status stable9 > %svn diff stable9 > % > > What did I do wrong? Ah! I see. I forgot that the manual pages are not in the same directory and that I need to merge to lib/libc as well. I shall fix now. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams