From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43540 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753197AbdEIJnB (ORCPT ); Tue, 9 May 2017 05:43:01 -0400 Subject: Patch "scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m" has been added to the 4.9-stable tree To: fthain@telegraphics.com.au, gregkh@linuxfoundation.org, martin.petersen@oracle.com Cc: , From: Date: Tue, 09 May 2017 11:41:49 +0200 Message-ID: <149432290915435@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: scsi-mac_scsi-fix-mac_scsi-m-option-when-scsi-m.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 2559a1ef688f933835912c731bed2254146a9b04 Mon Sep 17 00:00:00 2001 From: Finn Thain Date: Thu, 23 Feb 2017 09:08:02 +1100 Subject: scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m From: Finn Thain commit 2559a1ef688f933835912c731bed2254146a9b04 upstream. The mac_scsi driver still gets disabled when SCSI=m. This should have been fixed back when I enabled the tristate but I didn't see the bug. Fixes: 6e9ae6d560e1 ("[PATCH] mac_scsi: Add module option to Kconfig") Signed-off-by: Finn Thain Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -1497,7 +1497,7 @@ config ATARI_SCSI config MAC_SCSI tristate "Macintosh NCR5380 SCSI" - depends on MAC && SCSI=y + depends on MAC && SCSI select SCSI_SPI_ATTRS help This is the NCR 5380 SCSI controller included on most of the 68030 Patches currently in stable-queue which might be from fthain@telegraphics.com.au are queue-4.9/scsi-mac_scsi-fix-mac_scsi-m-option-when-scsi-m.patch