From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4+fsDJCI+gsvK86dHiome4DVgxEfH1BjTyk6EZOxueevTNDptku6Owqcd3cd0fQp4Qxau+o ARC-Seal: i=1; a=rsa-sha256; t=1524652891; cv=none; d=google.com; s=arc-20160816; b=0bn7xkBMh5PPCrT90RYOGAruiCk4UdVssuUVew7GYOac5accueE32LFtqQWazw4rP1 HvSexCQeLSdLxJ1h8wT/9e1Ot+cFSEK0NAD72VT2bjA7qsT/gZ0/METs4lMM1NE8+7vU 47uBxqAYxLxgeagO5M4Z4wAJ92BVUhNdaoJeRvCn6A+aQ/M5qVuXY1QvmyigL0LFe6S3 v/qVBZZpLUTvFQBWJ/lYyuyy+/qn96heTRavHGMNqHkBNJqSvKUFasx8kE7ZdljqRtWP Inf8IiI8Bixrtvk5GWNwMSXl8fAu1hL8L7bccfisRHEkbdK+61osdkFlP7H+i16q7ElE TWyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=P6m/Dvnuu2zxMN2BhxrEN9jC/FbXMtbIcvo7qyR3vuE=; b=GEfbCar3FjoWOYN8NT8NPDKjYXApZ8CPq5K56x5vBhyMz6Dy16OxrccJvj5D1xz9xx gVaejecwFOGxErnJzOXtJSCSEkOLhqSbhzjq9U73bDpHM7H67x7vS8x5PSqThiTrdfT+ zUhGgf0f66yTuqLBjmZZZC+2sRB8HGVaUJlhr9Wnps7LXgolCLqBQOPoyDtm51po1jb+ 4bd4oH3fBxLVQ1QuMLwMQAIoj4gEP2klUpfJniImMbTLsssE1ozACaEqCYpoMhjEciA4 RZKjFrz3cZrkJqNdEvXv6//XM9ZJYQh1PNAi5vs8lpgmI7U+A4e69XTL9tSPgClSTjdw 0ZHw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hannes Reinecke , "Martin K. Petersen" , "James E.J. Bottomley" , SCSI ML , Xose Vazquez Perez , Sasha Levin Subject: [PATCH 4.14 071/183] scsi: devinfo: fix format of the device list Date: Wed, 25 Apr 2018 12:34:51 +0200 Message-Id: <20180425103245.371701501@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425103242.532713678@linuxfoundation.org> References: <20180425103242.532713678@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1598714430413667607?= X-GMAIL-MSGID: =?utf-8?q?1598714430413667607?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xose Vazquez Perez [ Upstream commit 3f884a0a8bdf28cfd1e9987d54d83350096cdd46 ] Replace "" with NULL for product revision level, and merge TEXEL duplicate entries. Cc: Hannes Reinecke Cc: Martin K. Petersen Cc: James E.J. Bottomley Cc: SCSI ML Signed-off-by: Xose Vazquez Perez Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/scsi_devinfo.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -109,8 +109,8 @@ static struct { * seagate controller, which causes SCSI code to reset bus. */ {"HP", "C1750A", "3226", BLIST_NOLUN}, /* scanjet iic */ - {"HP", "C1790A", "", BLIST_NOLUN}, /* scanjet iip */ - {"HP", "C2500A", "", BLIST_NOLUN}, /* scanjet iicx */ + {"HP", "C1790A", NULL, BLIST_NOLUN}, /* scanjet iip */ + {"HP", "C2500A", NULL, BLIST_NOLUN}, /* scanjet iicx */ {"MEDIAVIS", "CDR-H93MV", "1.31", BLIST_NOLUN}, /* locks up */ {"MICROTEK", "ScanMaker II", "5.61", BLIST_NOLUN}, /* responds to all lun */ {"MITSUMI", "CD-R CR-2201CS", "6119", BLIST_NOLUN}, /* locks up */ @@ -120,7 +120,7 @@ static struct { {"QUANTUM", "FIREBALL ST4.3S", "0F0C", BLIST_NOLUN}, /* locks up */ {"RELISYS", "Scorpio", NULL, BLIST_NOLUN}, /* responds to all lun */ {"SANKYO", "CP525", "6.64", BLIST_NOLUN}, /* causes failed REQ SENSE, extra reset */ - {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN}, + {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN | BLIST_BORKEN}, {"transtec", "T5008", "0001", BLIST_NOREPORTLUN }, {"YAMAHA", "CDR100", "1.00", BLIST_NOLUN}, /* locks up */ {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN}, /* locks up */ @@ -255,7 +255,6 @@ static struct { {"ST650211", "CF", NULL, BLIST_RETRY_HWERROR}, {"SUN", "T300", "*", BLIST_SPARSELUN}, {"SUN", "T4", "*", BLIST_SPARSELUN}, - {"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN}, {"Tornado-", "F4", "*", BLIST_NOREPORTLUN}, {"TOSHIBA", "CDROM", NULL, BLIST_ISROM}, {"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},