Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e7fec29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata fixlet from Tejun Heo:
 "Simple blacklist entry addition"

* 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  Add factory recertified Crucial M500s to blacklist
parents b29083c5 7a7184b0

drivers/ata/libata-core.c

+2 −0
Original line number Diff line number Diff line
@@ -4230,6 +4230,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung SSD 8*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "FCCT*M500*",			NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },



	/* devices that don't properly handle TRIM commands */

	{ "SuperSSpeed S238*",		NULL,	ATA_HORKAGE_NOTRIM, },