From owner-svn-src-stable@freebsd.org Mon Aug 12 17:50:19 2019 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6FBBABB4B0; Mon, 12 Aug 2019 17:50:19 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 466jzv2LJXz4gCw; Mon, 12 Aug 2019 17:50:19 +0000 (UTC) (envelope-from mav@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31D6E232B; Mon, 12 Aug 2019 17:50:19 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7CHoJPS022911; Mon, 12 Aug 2019 17:50:19 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7CHoJ4T022910; Mon, 12 Aug 2019 17:50:19 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201908121750.x7CHoJ4T022910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 12 Aug 2019 17:50:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r350917 - stable/12/sbin/nvmecontrol/modules/intel X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/12/sbin/nvmecontrol/modules/intel X-SVN-Commit-Revision: 350917 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Aug 2019 17:50:19 -0000 Author: mav Date: Mon Aug 12 17:50:18 2019 New Revision: 350917 URL: https://svnweb.freebsd.org/changeset/base/350917 Log: MFC r341660 (by imp): This is not a samsung standard, so remove that alias. This was never documented, and isn't needed, so it's best removed to avoid confusion. Modified: stable/12/sbin/nvmecontrol/modules/intel/intel.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/nvmecontrol/modules/intel/intel.c ============================================================================== --- stable/12/sbin/nvmecontrol/modules/intel/intel.c Mon Aug 12 17:49:44 2019 (r350916) +++ stable/12/sbin/nvmecontrol/modules/intel/intel.c Mon Aug 12 17:50:18 2019 (r350917) @@ -117,7 +117,7 @@ print_intel_write_lat_log(const struct nvme_controller } /* - * Table 19. 5.4 SMART Attributes. Samsung also implements this and some extra data not documented. + * Table 19. 5.4 SMART Attributes. Others also implement this and some extra data not documented. */ static void print_intel_add_smart(const struct nvme_controller_data *cdata __unused, void *buf, uint32_t size __unused) @@ -192,7 +192,4 @@ NVME_LOGPAGE(intel_wlat, print_intel_write_lat_log, DEFAULT_SIZE); NVME_LOGPAGE(intel_smart, INTEL_LOG_ADD_SMART, "intel", "Extra Health/SMART Data", - print_intel_add_smart, DEFAULT_SIZE); -NVME_LOGPAGE(samsung_smart, /* NOTE, this will be deleted before 13.0 */ - INTEL_LOG_ADD_SMART, "samsung", "Extra Health/SMART Data", print_intel_add_smart, DEFAULT_SIZE);