From owner-freebsd-smp  Mon Dec  2 14:14:55 1996
Return-Path: owner-smp
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id OAA17592
          for smp-outgoing; Mon, 2 Dec 1996 14:14:55 -0800 (PST)
Received: from tfs.com (tfs.com [140.145.250.1])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id OAA17587
          for <freebsd-smp@freefall.freebsd.org>; Mon, 2 Dec 1996 14:14:52 -0800 (PST)
Received: from critter.tfs.com by tfs.com (smail3.1.28.1) with SMTP
	id m0vUgd1-0003yVC; Mon, 2 Dec 96 14:14 PST
Received: from critter.tfs.com (localhost.phk.dk [127.0.0.1]) by critter.tfs.com (8.8.2/8.8.2) with ESMTP id XAA03050; Mon, 2 Dec 1996 23:15:55 +0100 (MET)
To: Steve Passe <smp@csn.net>
cc: freebsd-smp@freefall.freebsd.org
Subject: Re: cvs commit: sys/i386/include pmap.h 
In-reply-to: Your message of "Mon, 02 Dec 1996 14:23:53 MST."
             <199612022123.OAA22855@clem.systemsix.com> 
Date: Mon, 02 Dec 1996 23:15:55 +0100
Message-ID: <3048.849564955@critter.tfs.com>
From: Poul-Henning Kamp <phk@critter.tfs.com>
Sender: owner-smp@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

>
>I want:
>
> minor changes to SMP-current \
>                              +-- start necessary long term changes.
> -current                     /
>
>Not:
>
> fix SMP-current, fix SMP-current, ... fix SMP-current \
>                                                       +-- someday...
> fix -current,    fix -current,    ... fix -current    /
>


Well, I think you can have:


	smp ---
		\
	lite2 ---------
			\
	current----------------->

or instead

	smp --------------
		           \
	lite2 ---------     \
			\    \
	current----------------->

But I'm pretty sure that lite2 will get merged before smp as things
stand now.
	
--
Poul-Henning Kamp           | phk@FreeBSD.ORG       FreeBSD Core-team.
http://www.freebsd.org/~phk | phk@login.dknet.dk    Private mailbox.
whois: [PHK]                | phk@tfs.com           TRW Financial Systems, Inc.
Power and ignorance is a disgusting cocktail.