From owner-freebsd-stable@FreeBSD.ORG Wed Jan 28 17:35:07 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F4121065675; Wed, 28 Jan 2009 17:35:07 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id 2EF758FC0A; Wed, 28 Jan 2009 17:35:07 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id B572541C67B; Wed, 28 Jan 2009 18:35:05 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id VJKnmFXSPpYk; Wed, 28 Jan 2009 18:35:05 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id 5D24241C679; Wed, 28 Jan 2009 18:35:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 31B854448E6; Wed, 28 Jan 2009 17:31:28 +0000 (UTC) Date: Wed, 28 Jan 2009 17:31:28 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: freebsd-jail@freebsd.org, freebsd-stable@freebsd.org In-Reply-To: <20090128150840.E45963@maildrop.int.zabbadoz.net> Message-ID: <20090128172923.S45963@maildrop.int.zabbadoz.net> References: <20090128150840.E45963@maildrop.int.zabbadoz.net> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Subject: Re: HEADS UP: multi-IPv4/v6/no-IP jails merge to 7-STABLE ahead X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jan 2009 17:35:08 -0000 On Wed, 28 Jan 2009, Bjoern A. Zeeb wrote: > Hi, > > I have a possible MFC candidate patch at: > http://people.freebsd.org/~bz/20090128-02-jail7-mfc.diff > > to merge the multi-IPv4/v6/no-IP jails to 7-STABLE. My plan would be > to do so during the weekend of 6-8th February 2009. > > In addition to what the patch says at the beginning (__FreeBSD_version > bump), the patch also has the regenerated compat/freebsd32 sysctl > stuff in it so that people can apply, compile and run it directly. > For the merge this would be a second commit. > > For committers who want to review that I have done the merge right, it > is an svn diff with mergeinfo included. > > For details about the patch, features, .. see the original commit > message and follow-up a few days later (both in one post): > http://lists.freebsd.org/pipermail/freebsd-jail/2008-December/000631.html > > Since then a few bug fixes went in, some older PRs were handled, ... > > Now is the time for you to try and review it for 7-STABLE, etc. One more thing that I had forgotten and was pointed at: sys/kern/kern_jail.c includes the __FBSDID() line. I just manually edited the patch to contain the proper CVS (not SVN) value. You may a) want to check that things apply cleanly and/or b) to sure to manually apply the hunk from the .rej. /bz -- Bjoern A. Zeeb The greatest risk is not taking one.