[illumos-gate merge]20140821release-20140821

commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
    5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
    5092 env files don't need to define LOCKNAME by default
    5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
    4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
    5066 remove support for non-ANSI compilation
    5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
    5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86

Manifests:
	usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
	usr/src/pkg/manifests/SUNWparted.mf (torch headers)
	usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
	usr/src/pkg/manifests/system-storage-parted.mf

1 files changed, 0 insertions, 185 deletions

diff --git a/usr/src/man/man1m/ntfsprogs.1m b/usr/src/man/man1m/ntfsprogs.1m
deleted file mode 100644
index 8be9e8f989..0000000000
--- a/usr/src/man/man1m/ntfsprogs.1m
+++ /dev/null
@@ -1,185 +0,0 @@
-'\" te
-.\" Portions Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
-.\" Copyright (c) 2002-2006 Szabolcs Szakacsits
-.\" Copyright (c) 2002-2005 Anton Altaparmakov
-.\" Copyright (c) 2002-2003 Richard Russon
-.\" Copyright (c) 2007 Yura Pakhuchiy
-.\" This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation ; either version 2 of the License, or (at your option) any later version.  This program is distributed
-.\" in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.  You should have received a copy of the GNU General Public License along with this program
-.\" (in the main directory of the Linux-NTFS distribution in the file COPYING);  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 11-1307 USA
-.TH NTFSPROGS 1M "May 28, 2009"
-.SH NAME
-ntfsprogs \- list of NTFS tools
-.SH SYNOPSIS
-.LP
-.nf
-\fBntfsprogs\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-\fBntfsprogs\fR is the name of a suite of NTFS utilities based around a shared
-library. The tools are available for free and come with full source code. The
-tools are listed below.
-.sp
-.ne 2
-.na
-\fB\fBmkntfs\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Create an NTFS filesystem.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfscat\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Dump a file's content to the standard output.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfsclone\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Efficiently clone, backup, restore, or rescue NTFS.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfscluster\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Locate the files that use the specified  sectors or clusters.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfscmp\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Compare two NTFS file systems and report the differences.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfscp\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Copy a file to an NTFS volume.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfsfix\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Check and fix some common errors, clear the log file, and make the operating
-system perform a thorough check next time it boots.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfsinfo\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Show information about NTFS or one of the files or directories within it.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfslabel\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Show, or set, an NTFS filesystem's volume label.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfsls\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-List information about files in a directory residing on an NTFS.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfsmount(1M)\fR (not a SunOS man page)\fR
-.ad
-.sp .6
-.RS 4n
-Read-write NTFS user space driver.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfsresize\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Resize NTFS without losing data.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBntfsundelete\fR(1M)\fR
-.ad
-.sp .6
-.RS 4n
-Recover deleted files from NTFS.
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Uncommitted
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBparted\fR(1M), \fBattributes\fR(5)
-.sp
-.LP
-http://wiki.linux-ntfs.org
-.SH AUTHORS
-.sp
-.LP
-The tools were written by Anton Altaparmakov, Carmelo Kintana,  Cristian Klein,
-Erik Sornes, Giang Nguyen, Holger Ohmacht, Lode Leroy, Matthew J. Fanto, Per
-Olofsson, Richard Russon, Szabolcs Szakacsits, Yura Pakhuchiy, and Yuval
-Fledel.