From owner-svn-src-all@FreeBSD.ORG Mon Oct 29 04:47:18 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 997A5A92 for ; Mon, 29 Oct 2012 04:47:18 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-da0-f54.google.com (mail-da0-f54.google.com [209.85.210.54]) by mx1.freebsd.org (Postfix) with ESMTP id 5CFAA8FC12 for ; Mon, 29 Oct 2012 04:47:18 +0000 (UTC) Received: by mail-da0-f54.google.com with SMTP id z9so2296183dad.13 for ; Sun, 28 Oct 2012 21:47:18 -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=ufbtiYn0RyKrcZfVZAQUL6x5M47vTGQu8Bx9ZjENevE=; b=V1HfhVYirSNZHq4PZXe55oIWiXKwsPkAHrwsnuyQaQyTxQd3TWz0eUJHEQqB6RbPAA j9QnJRlimASiVC4oXg/0M8zp3NCNDD4dZy32nAQn0GGBgfhz8cUjctoUqWrbwpZJn/G/ x6VQoxyL1KsJwjQvjOZpFfKGi2yRNIVqn48W8= 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=ufbtiYn0RyKrcZfVZAQUL6x5M47vTGQu8Bx9ZjENevE=; b=YpfxrpZWlWONBr3+ndGf+Ba1JcISTazcuanNny+awmlzo68ERiYOFwk/aKRnaWyY5h IfHZDlLsWARAY1iKMNRT0z0uBP9nvgkda+HnrF3C0as6AJ7E2wbpDyryi/Tix5yf+ZmQ s2t0brc8e0Ghlx2Yd2JyIfyppwMHV+NbN5KoAcGrCMftsjd5wn7cgEBprUA3tggH7ARb MfiouX0zud7izRNnIm4ndxXhCQGXpsUzkFfvn3DC6rUpyNNtlqwDDwOIIHXepuszfHqb adt49k14mZfnmjNgFOQQoPrxdGWB1NYC8z72iPjdQd5DIjFffUkNvp0DdEqj6+m+YfK6 UNzA== Received: by 10.68.200.231 with SMTP id jv7mr88976626pbc.140.1351486037942; Sun, 28 Oct 2012 21:47:17 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.66.161.163 with HTTP; Sun, 28 Oct 2012 21:46:47 -0700 (PDT) In-Reply-To: <20121029043242.GH73505@kib.kiev.ua> References: <201210290352.q9T3qJa3070064@svn.freebsd.org> <20121029043242.GH73505@kib.kiev.ua> From: Eitan Adler Date: Mon, 29 Oct 2012 00:46:47 -0400 X-Google-Sender-Auth: ry8_QfUdeLqN_XPQmsRCa1GO124 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: ALoCoQlUbYbzNVJ1wM1Kc5iCBL/CCrBaqpbC0mtCtcyD8k8BGwCg5GhqCaSK85EuUUItx+ON0sRr 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:47:18 -0000 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? -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams