From owner-cvs-src@FreeBSD.ORG  Mon Dec 19 10:58:59 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 63A5916A41F;
	Mon, 19 Dec 2005 10:58:59 +0000 (GMT)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1710643D46;
	Mon, 19 Dec 2005 10:58:59 +0000 (GMT)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBJAwwHC082411;
	Mon, 19 Dec 2005 10:58:58 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBJAwwCp082410;
	Mon, 19 Dec 2005 10:58:58 GMT (envelope-from delphij)
Message-Id: <200512191058.jBJAwwCp082410@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 19 Dec 2005 10:58:58 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6_0
Cc: 
Subject: cvs commit: src UPDATING src/sys/conf newvers.sh src/sys/nfsclient
 nfs_vnops.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Dec 2005 10:58:59 -0000

delphij     2005-12-19 10:58:58 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6_0)
    .                    UPDATING 
    sys/conf             newvers.sh 
    sys/nfsclient        nfs_vnops.c 
  Log:
  Merge from RELENG_6 of src/sys/nfsclient/nfs_vnops.c rev 1.258.2.1:
    MFC 1.260 (by ps): Fixed a panic that can happen when nfs_lookup() hits
    an error.
  
  Work done by:   Mohan Srinivasan
  Approved by:    re (scottl), so (cperciva)
  Erratum:        FreeBSD-EN-05:04.nfs
  
  Revision       Changes    Path
  1.416.2.3.2.6  +5 -0      src/UPDATING
  1.69.2.8.2.2   +1 -1      src/sys/conf/newvers.sh
  1.258.4.1      +1 -1      src/sys/nfsclient/nfs_vnops.c