Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata (476d9ff6) · Commits · 戴 / test

Pull libata fixes from Tejun Heo: "These two are fixes which missed v4.17. One is to remove an incorrect power management blacklist entry and the other to fix a cdb buffer overrun which has been there for a very long time" * 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk libata: zpodd: small read overflow in eject_tray()

drivers/ata/libata-core.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -4557,9 +4557,6 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
		{ "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM, },
		{ "SAMSUNG SSD PM830 mSATA *", "CXM13D1Q", ATA_HORKAGE_NOLPM, },

		/* Sandisk devices which are known to not handle LPM well */
		{ "SanDisk SD7UB3Q*G1001", NULL, ATA_HORKAGE_NOLPM, },

		/* devices that don't properly handle queued TRIM commands */
		{ "Micron_M500IT_*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM \|
		ATA_HORKAGE_ZERO_AFTER_TRIM, },

drivers/ata/libata-zpodd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ struct zpodd {
		static int eject_tray(struct ata_device *dev)
		{
		struct ata_taskfile tf;
		static const char cdb[] = { GPCMD_START_STOP_UNIT,
		static const char cdb[ATAPI_CDB_LEN] = { GPCMD_START_STOP_UNIT,
		0, 0, 0,
		0x02, /* LoEj */
		0, 0, 0, 0, 0, 0, 0,

Admin message