From owner-svn-src-all@FreeBSD.ORG Sun Jun 17 21:11:46 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id E7623106566B; Sun, 17 Jun 2012 21:11:46 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from opti.dougb.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 89BD1162878; Sun, 17 Jun 2012 21:11:24 +0000 (UTC) Message-ID: <4FDE47FC.3090809@FreeBSD.org> Date: Sun, 17 Jun 2012 14:11:24 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:13.0) Gecko/20120609 Thunderbird/13.0 MIME-Version: 1.0 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org References: <201206172106.q5HL6a4O032632@svn.freebsd.org> In-Reply-To: <201206172106.q5HL6a4O032632@svn.freebsd.org> X-Enigmail-Version: 1.4.2 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Subject: Re: svn commit: r237205 - stable/9/sys/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sun, 17 Jun 2012 21:11:47 -0000 On 06/17/2012 14:06, Doug Barton wrote: > stable/9/sys/conf/ (props changed) There is what looks like a really large amount of crufty mergeinfo on stable/9/sys/conf. The diff was large and hairy enough that I didn't feel comfortable tackling it in the time I have allotted today. Given that 9 is still a fairly new branch, it would probably be good if someone with the knowledge and time were to see about cleaning it up. ... which leads to the gentle reminder, always do merges for files under sys/ IN sys/. Doug -- This .signature sanitized for your protection