From owner-cvs-all@FreeBSD.ORG  Thu Jan  6 17:54:50 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0D94D16A4CE; Thu,  6 Jan 2005 17:54:50 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D7BD343D31; Thu,  6 Jan 2005 17:54:49 +0000 (GMT)
	(envelope-from nectar@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 j06HsnW3035173;
	Thu, 6 Jan 2005 17:54:49 GMT
	(envelope-from nectar@repoman.freebsd.org)
Received: (from nectar@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j06HsmIo035172;
	Thu, 6 Jan 2005 17:54:48 GMT
	(envelope-from nectar)
Message-Id: <200501061754.j06HsmIo035172@repoman.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Thu, 6 Jan 2005 17:54:47 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5_3
Subject: cvs commit: src UPDATING src/sys/conf newvers.sh src/sys/pci
 if_sk.c if_skreg.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jan 2005 17:54:50 -0000

nectar      2005-01-06 17:54:47 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5_3)
    .                    UPDATING 
    sys/conf             newvers.sh 
    sys/pci              if_sk.c if_skreg.h 
  Log:
  Merge from RELENG_5 if_sk.c 1.83.2.3 1.83.2.4, if_skreg.h 1.20.2.3:
  Correct bugs in the sk(4) network driver that could result in
  data corruption and system crashes on SMP systems.
  
  Approved by:    so, re
  
  Revision        Changes    Path
  1.342.2.13.2.7  +4 -0      src/UPDATING
  1.62.2.15.2.9   +1 -1      src/sys/conf/newvers.sh
  1.83.2.2.2.1    +33 -16    src/sys/pci/if_sk.c
  1.20.2.2.2.1    +1 -0      src/sys/pci/if_skreg.h