From owner-p4-projects@FreeBSD.ORG  Fri Apr  1 16:32:47 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 21D9C1065829; Fri,  1 Apr 2011 16:32:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1838310656B2
	for <perforce@freebsd.org>; Fri,  1 Apr 2011 16:32:45 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 04CD78FC15
	for <perforce@freebsd.org>; Fri,  1 Apr 2011 16:32:45 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWi1u075248
	for <perforce@freebsd.org>; Fri, 1 Apr 2011 16:32:44 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWiwf075245
	for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:44 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 1 Apr 2011 16:32:44 GMT
Message-Id: <201104011632.p31GWiwf075245@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 190744 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Apr 2011 16:32:47 -0000

http://p4web.freebsd.org/@@190744?ac=10

Change 190744 by trasz@trasz_victim on 2011/03/29 19:38:51

	Fix mismerge.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#24 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#24 (text+ko) ====

@@ -182,7 +182,6 @@
 	char		 pr_hostname[MAXHOSTNAMELEN];	/* (p) jail hostname */
 	char		 pr_domainname[MAXHOSTNAMELEN];	/* (p) jail domainname */
 	char		 pr_hostuuid[HOSTUUIDLEN];	/* (p) jail hostuuid */
-	struct racct	 *pr_racct;			/* (c) resource accounting */
 };
 #endif /* _KERNEL || _WANT_PRISON */