 @@ -1,14 +1,14 @@
-#	$NetBSD: BRANCHES,v 1.308 2011/06/02 22:15:22 cherry Exp $
+#	$NetBSD: BRANCHES,v 1.309 2011/06/12 03:50:42 rmind Exp $
+#
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
+#
 # This list is necessarily incomplete.
+#
 # Within reason, developers may create branch and version tags at any
 # time for any purpose.  To avoid name collisions, private tags should
 # have names which begin with the developer's NetBSD login name
 # followed by a - or _ character (e.g., thorpej_scsipi,
 # thorpej-signal)
+#
 # Any branch or version tag not listed here should be assumed to be
 @@ -485,49 +485,26 @@ Notes:		Sync'ing net80211 with FreeBSD a
 Branch:	  	pkgviews
 Description:  	package views, enabling multiple conflicting packages to co-exist
 Status:		Active
 Start Date:	22 July 2002
 End Date:
 Base Tag:	pkgviews
 Maintainer:	Alistair Crooks <agc@NetBSD.org>
 Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
 Notes:		A more flexible infrastructure for third-party packages by
 		allowing multiple conflicting packages and versions to co-exist
 		within the same tree
 Branch:		rmind-uvmplock
 Description:	Reorganize locking in UVM and improve x86 pmap(9)
 Status:		Active
 Start Date:	15 March 2010
 End Date:
 Base Tag:	rmind-uvmplock-base
 Maintainer:	Mindaugas Rasiukevicius <rmind@netbsd.org>
 Scope:		Kernel
 Notes:		Goals:
 		- Reorganize locking in UVM and serialize pmap(9) operations
 		  on same page(s).  New lock order: [vmpage-lock] -> pmap-lock.
 		  Based on the patch from ad@.
 		- Simplify locking in pmap(9) modules by removing P->V locking.
 		- Use mutex_obj(9) on vmobjlock (and thus vnode_t::v_interlock)
 		  to share locks among UVM objects where necessary.
 		- Rewrite and optimize x86 TLB shootdown code.
 		- Unify /dev/mem et al in MI code and provide required locking.
 		Future work:
 		- Optimize pmap_remove() with tracking in struct vm_map_entry.
 Branch:		rpaulo-netinet-merge-pcb
 Description:	merge in6pcb with inpcb
 Status:		Dormant
 Start Date:	Wed Feb 01 2006
 End Date:
 Base Tag:	rpaulo-netinet-merge-pcb-base
 Maintainer:	Rui Paulo <rpaulo@NetBSD.org>
 Scope:		src/sys
 Notes:		No longer active due to the lack of time. If you plan to
 		continue this branch, sys/netinet/in_pcb.h already contains
 		the proposed structure layout (which was roughly discussed
 		in the tech-net mailing list).
 		I also defined INP_*() macros to mimicate FreeBSD's inpcb
 @@ -1069,26 +1046,49 @@ Description:	New ALTQ framework:
 		- share mtag/name mapping functions
 		- separate altq + pf attachment
 Status:		Terminated; merged to -current
 Start Date:	March 16, 2006
 End Date:	October 12, 2006
 Base Tag:	peter-altq-base
 Maintainer:	Peter Postma <peter@NetBSD.org>,
 		Martin Husemann <martin@NetBSD.org>,
 		Matthias Scheler <tron@NetBSD.org>
 Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
 Notes:		Only the first item in the description was finished
 		in this branch.
 Branch:		rmind-uvmplock
 Description:	Reorganize locking in UVM and improve x86 pmap(9)
 Status:		Terminated; merged to -current
 Start Date:	15 March 2010
 End Date:	12 June 2011
 Base Tag:	rmind-uvmplock-base
 Maintainer:	Mindaugas Rasiukevicius <rmind@netbsd.org>
 Scope:		Kernel
 Notes:		Goals:
 		- Reorganize locking in UVM and serialize pmap(9) operations
 		  on same page(s).  New lock order: [vmpage-lock] -> pmap-lock.
 		  Based on the patch from ad@.
 		- Simplify locking in pmap(9) modules by removing P->V locking.
 		- Use mutex_obj(9) on vmobjlock (and thus vnode_t::v_interlock)
 		  to share locks among UVM objects where necessary.
 		- Rewrite and optimize x86 TLB shootdown code.
 		- Unify /dev/mem et al in MI code and provide required locking.
 		Future work:
 		- Optimize pmap_remove() with tracking in struct vm_map_entry.
 Branch:		sommerfeld_i386mp_1
 Description:	Multiprocessor support for i386 using Intel MP BIOS.
 Status:		Terminated; merged to -current
 Start Date:	21 Feb 2000
 End Date:	01 Oct 2002
 Base Tag:	sommerfeld_i386mpbase_1
 Maintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
 Scope:		sys/arch/i386
 Notes:
 		Code committed to the branch has booted to multiuser
 		on at least one system.
 		Not guaranteed to compile against mainline since -current

 @@ -1,14 +1,14 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1555 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1556 $>
+#
+#
 # [Note: This file does not mention every change made to the NetBSD source tree.
 # For an exhaustive list, please subscribe to the `source-changes' mailing list,
 # or see the mailing list archives.  For more information, send a message
 # containing just the word `help' to `majordomo@NetBSD.org'.]
+#
 # ----------------------------------------------------------------------------
 # PLEASE USE THE FOLLOWING STYLE WHEN ADDING ITEMS:
+#
 #	theme: Content ...
 #		more content ...
 #		more content. [developer DATE-FORMAT]
 @@ -1011,13 +1011,14 @@ Changes from NetBSD 5.0 to NetBSD 6.0:
 	file(1): Import 5.07 (christos 20110512)
 	userconf(4), boot.cfg(5), boot(8), i386, amd64: Support userconf(4)
 		command in boot.cfg(5)/boot(8) on i386/amd64.
 		[uebayasi 20110526]
 	kernel: add SOCK_SEQPACKET for local sockets [manu 20110529]
 	bind: Update to 9.8.0-P2: Security fixes. [spz 20110529]
 	tmpfs: Many fixes and some performance improvements. [rmind 20110529]
 	powerpc: Initial SMP support for MPC85xx, reworked and unified IPI
 		code, various other improvements. [matt 20110605]
 	ktrace(1): Add a new trace point to list all open file descriptors
 		after exec(3). [alnsn 20110601]
 	alpha: Converted Alpha to use PCU to manage FPU. [matt 20110607]
 	sparc: enable options MODULAR in the GENERIC* kernels.  [mrg 20110611]
 	kernel: Merge of the rmind-uvmplock branch. [rmind 20110612]