From f2b86b2bebe8177f40cf81d8dbcdea011ef96a35 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Wed, 5 Dec 2018 20:36:52 +0000
Subject: [PATCH] Merge r4848 r4850 into 5.41-6.6 drivedb.h branches.
git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4851 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
smartmontools/drivedb.h | 6 ++++++
smartmontools/drivedb.h.raw.asc | 14 +++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 548249ad0..d9ab12c73 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -4929,6 +4929,12 @@ const drive_settings builtin_knowndrives[] = {
"",
"-d sat"
},
+ { "USB: ; JMicron JMS583", // USB->PCIe (NVMe)
+ "0x152d:0x0583",
+ "",
+ "",
+ "" // smartmontools >= r4850: -d sntjmicron#please_try
+ },
{ "USB: OCZ THROTTLE OCZESATATHR8G; JMicron JMF601",
"0x152d:0x0602",
"",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index c2196a5eb..40aca0636 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAABAgAGBQJcBCRrAAoJEPOHY87f0iVZy/0IAIKJtFp6OVhX5BMxHIVKtZbz
-OR/EEmkl/KEwgxWo7VVi9yx+kihsZ5TFaUIBR5g0qdgZDhy9HMmJ3gFUEhiFPHF9
-ZTO3o7BJGCSZ3074uNKcsM4ZKPg7T9r0xJ7dtGjr33nnDDj1QOWdFUbaUib5PAxj
-sDqn4s6gY7Kygg5IHtSpBzqXT6pva7is4q3r3S++OHGzljUhcgUzcVSd8a5OsXi1
-sVSvZ3DC5xa+GwOaGCNW7jffYOVzw+tIujZXLCmY1BJfdAqMDipv6COjrWXuSmlv
-c/ue1nwBoBoYCKVl8KTbB/N3VrjyI3DBadtBZ9p5w2AedWDB7D/rw/G0lYRJBrg=
-=AJxZ
+iQEcBAABAgAGBQJcCDYPAAoJEPOHY87f0iVZ7P4IAKa/mJDPP1YNTAO56iIY27FM
+Fm8uR0TzFWzj0sfmaGPSgmlM5ac0jD9U2dzFTn+KyKrk31XGgqY5qewiikG0CVVT
+2dnMIcyugKd/YXgR4++Cw8nOwGa22fN9wq7IuwDlcEqEF3/ge8snne6F1cyjMl2F
+croNLbHMNQRhQ/WzV3PBPmqMVE/Xkh1pUsHJgqhvapjYcE+MmwcX512uq9vZaw+i
+BDfXSLZmF7LChfopd2l42w3F5nIunDmc2DT/pHYvbIE04NQiX02dqdmKHT2NjGjf
+xuSRn0AafGZ2idMK6goo85UO9w9MMNsqzLy6U1HikzmjvKViXCDvIvhsRfbxDn4=
+=PNFc
-----END PGP SIGNATURE-----
--
GitLab