From owner-freebsd-stable Wed May 29 12:50:49 1996 Return-Path: owner-stable Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA00286 for stable-outgoing; Wed, 29 May 1996 12:50:49 -0700 (PDT) Received: from time.cdrom.com (time.cdrom.com [204.216.27.226]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id MAA00278 for ; Wed, 29 May 1996 12:50:45 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by time.cdrom.com (8.7.5/8.6.9) with SMTP id MAA21623 for ; Wed, 29 May 1996 12:50:27 -0700 (PDT) To: stable@freebsd.org Subject: Heads up, -stable, for an oncoming merge! Date: Wed, 29 May 1996 12:50:27 -0700 Message-ID: <21621.833399427@time.cdrom.com> From: "Jordan K. Hubbard" Sender: owner-stable@freebsd.org X-Loop: FreeBSD.org Precedence: bulk sup and CTM folks have probably noticed things popping up under the RELENG_2_1_0 tag for the last couple of days - phase one of my 2.2 userland merge. What's coming in over the next 24 hours will be merged secure, eBones, bin, etc, share/mk, lib/csu, release and gnu subdirectories. What won't be merged: o Clients of gnumalloc continue to use it, since phkmalloc won't be coming into the 2.1-stable tree. gnumalloc also remains in gnu/lib. o Any support specifically for threads. o pccard related files in /etc. You *WILL* need to do a make world for this, the mk files have been changed! I've also brought over the 2.2 bsd.port.mk because it was easier to do so than not to - if it turns into a major hassle then we can revert it, but I suspect that most people won't even notice. Jordan