From owner-svn-src-stable-10@freebsd.org  Fri Apr  8 13:43:40 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A68C9B085B5;
 Fri,  8 Apr 2016 13:43:40 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76B001158;
 Fri,  8 Apr 2016 13:43:40 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u38DhdR1032646;
 Fri, 8 Apr 2016 13:43:39 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u38DhdC2032644;
 Fri, 8 Apr 2016 13:43:39 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201604081343.u38DhdC2032644@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Fri, 8 Apr 2016 13:43:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r297711 - in stable/10/sys/cam: ata scsi
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Apr 2016 13:43:40 -0000

Author: sbruno
Date: Fri Apr  8 13:43:39 2016
New Revision: 297711
URL: https://svnweb.freebsd.org/changeset/base/297711

Log:
  Revert svn 297681 as it has been deprecated by svn 297575.
  
  Submitted by:	Tomoaki AOKI <junchoon@dec.dakura.ne.jp>

Modified:
  stable/10/sys/cam/ata/ata_da.c
  stable/10/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ata/ata_da.c
==============================================================================
--- stable/10/sys/cam/ata/ata_da.c	Fri Apr  8 11:59:11 2016	(r297710)
+++ stable/10/sys/cam/ata/ata_da.c	Fri Apr  8 13:43:39 2016	(r297711)
@@ -485,14 +485,6 @@ static struct ada_quirk_entry ada_quirk_
 	},
 	{
 		/*
-		 * Samsung SM863 Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7KM*", "*" },
-		/*quirks*/ADA_Q_4K
-	},
-	{
-		/*
 		 * SuperTalent TeraDrive CT SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */

Modified: stable/10/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_da.c	Fri Apr  8 11:59:11 2016	(r297710)
+++ stable/10/sys/cam/scsi/scsi_da.c	Fri Apr  8 13:43:39 2016	(r297711)
@@ -1157,14 +1157,6 @@ static struct da_quirk_entry da_quirk_ta
 	},
 	{
 		/*
-		 * Samsung SM863 Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7KM*", "*" },
-		/*quirks*/DA_Q_4K
-	},
-	{
-		/*
 		 * SuperTalent TeraDrive CT SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */