Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-04 12:03:15 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-04 12:03:15 +0200
commitb48da41c6f2ae88c7117333dcd2b0ffc5dc08b35 (patch)
tree2ce854dcaba5f93520925a76af7d9f943d7d40c0
parent2e76cadf7ea83021885c5ef8368fe463729aa919 (diff)
parent22fd19c08aef69310bd9fe136067010f8be904df (diff)
Merge branch 'master-vanilla-configs' into linux-next
-rw-r--r--config/arm64/vanilla2
-rw-r--r--config/armv7hl/vanilla2
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/ppc64le/vanilla2
-rw-r--r--config/x86_64/vanilla2
6 files changed, 6 insertions, 6 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index f1361891ce..c92e7934d1 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -2561,7 +2561,7 @@ CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 379d824e0e..0947be6cea 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -2669,7 +2669,7 @@ CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 8588905164..94fb365f59 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -2558,7 +2558,7 @@ CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 15c97d7884..d3c831bc6d 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -2187,7 +2187,7 @@ CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 71f6d2b32d..03c09bd4a1 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -2089,7 +2089,7 @@ CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 398956293b..e2eb93a083 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -2555,7 +2555,7 @@ CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports