This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.
Move up to 5.3-RC1

Approved by: re
Merge nfs_serv.c:1.149 (RELENG_5 1.147.2.2) from HEAD to RELENG_5_3:

  date: 2004/10/18 11:23:11;  author: rwatson;  state: Exp;  lines: +61 -13
  Correct several instances where calls to vfs_getvfs() resulting in
  failure in the NFS server would result in a leaked instance of the NFS
  server subsystem lock.  Liberally sprinkle assertions in all target
  labels for error unwinding to assert the desired locking state.

  RELENG_5_3 candidate.

  MFC after:      3 days
  Reported by:    Wilkinson, Alex <alex dot wilkinson at dsto dot defence dot
                  gov dot au>

Approved by:	re (scottl)
Merge kern_descrip.c:1.246, uipc_socket.c:1.214, uipc_usrreq.c:1.141,
raw_cb.c:1.30, raw_usrreq.c:1.35, ddp_pcb.c:1.45, atm_socket.c:1.21,
ng_btsocket_hci_raw.c:1.16, ng_btsocket_l2cap.c:1.14,
ng_btsocket_l2cap_raw.c:1.13, ng_btsocket_rfcomm.c:1.13, in_pcb.c:1.156,
tcp_subr.c:1.205, in6_pcb.c:1.61, ipx_pcb.c:1.29, ipx_usrreq.c:1.41,
natm.c:1.35, socketvar.h:1.135 from HEAD to RELENG_5_3:

  Push acquisition of the accept mutex out of sofree() into the caller
  (sorele()/sotryfree()):

  - This permits the caller to acquire the accept mutex before the socket
    mutex, avoiding sofree() having to drop the socket mutex and re-order,
    which could lead to races permitting more than one thread to enter
    sofree() after a socket is ready to be free'd.

  - This also covers clearing of the so_pcb weak socket reference from
    the protocol to the socket, preventing races in clearing and
    evaluation of the reference such that sofree() might be called more
    than once on the same socket.

  This appears to close a race I was able to easily trigger by repeatedly
  opening and resetting TCP connections to a host, in which the
  tcp_close() code called as a result of the RST raced with the close()
  of the accepted socket in the user process resulting in simultaneous
  attempts to de-allocate the same socket.  The new locking increases
  the overhead for operations that may potentially free the socket, so we
  will want to revise the synchronization strategy here as we normalize
  the reference counting model for sockets.  The use of the accept mutex
  in freeing of sockets that are not listen sockets is primarily
  motivated by the potential need to remove the socket from the
  incomplete connection queue on its parent (listen) socket, so cleaning
  up the reference model here may allow us to substantially weaken the
  synchronization requirements.

  RELENG_5_3 candidate.

  MFC after:      3 days
  Reviewed by:    dwhite
  Discussed with: gnn, dwhite, green
  Reported by:    Marc UBM Bocklet <ubm at u-boot-man dot de>
  Reported by:    Vlad <marchenko at gmail dot com>

Approved by:    re (scottl)
MFS revision 1.6.8.1: Fix a buffer overflow.

Approved by:	re (scottl)
MFC:

Close a possible race which could prevent geom classes from being unloaded
on SMP machines due to traffic counters getting out of whack.

Approved by:	re::scottl
MFR_5. Make the loadable module have the same content as the
compiled-in mem device. This means the Module has MTRR for
i386 and amd64.

Approved by:	re(scottl)
MFC: Wake up the pager from critical_exit if the process being switched to
needs to be swapped in.

Approved by: re
MF5: rev 1.64.2.3:

MFC: rev 1.65:
Don't put devel/gdb6 on disc1 for non-i386 platforms. We have gdb6 in
the base-system. Adding the port for ia64 on disc1 is especially bogus,
because the port doesn't even build on ia64. It also doesn't support
libthread_db.

MFC: rev 1.68:
Seperate ia64 from the pack. The disc1 is overflowing to such extend
that most packages can not be included. It's much easier to list those
that we do want on disc1 for ia64. We only need to list 11 of them.

Approved by: re (scottl)
Forced commit to note tags were slid to make the Simplified Chinese
Translation release docs part of RELENG_5 and RELENG_5_3 so they
will be included in the 5.3-RELEASE.

Requested by:	Xin LI <delphij (at) frontfree (dot) net>
Approved by:	re (scottl)
MFR5 of Time Zone update tzdata2004e.

Versions being MFR5-ed:

>   Revision   Changes    Path
>   1.304.2.3  +2 -0      src/etc/mtree/BSD.usr.dist
>   1.24.4.1   +74 -23    src/share/zoneinfo/asia
>   1.27.4.1   +25 -20    src/share/zoneinfo/europe
>   1.10.4.1   +11 -9     src/share/zoneinfo/leapseconds
>   1.23.4.1   +61 -35    src/share/zoneinfo/northamerica
>   1.22.4.1   +184 -27   src/share/zoneinfo/southamerica
>   1.16.4.1   +13 -6     src/share/zoneinfo/zone.tab

Work done by:	wollman
Approved by:	re (scottl)