summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-07-29 08:04:07 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-07-29 08:04:07 +0200
commit4336702eb58d8db329d89456f714ed7f0de793e3 (patch)
treec7001fe04d6dce51fa345f86d0ecb6bb17f9931c
parent8e2ea7a848df6d5983e69c49f36e3e152c7ec190 (diff)
parentb5bfb26495e9f9ce7300cef60dc3febcefedf0d4 (diff)
downloadkernel-4336702eb58d8db329d89456f714ed7f0de793e3.tar.gz
kernel-4336702eb58d8db329d89456f714ed7f0de793e3.tar.xz
kernel-4336702eb58d8db329d89456f714ed7f0de793e3.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r--configs/fedora/debug/CONFIG_DMADEVICES_DEBUG2
-rw-r--r--configs/fedora/generic/CONFIG_FW_LOADER_COMPRESS2
-rw-r--r--kernel-aarch64-debug.config4
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config4
-rw-r--r--kernel-armv7hl-lpae-debug.config4
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-debug.config4
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64le-debug.config4
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-s390x-debug.config4
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config4
-rw-r--r--kernel-x86_64.config2
16 files changed, 23 insertions, 23 deletions
diff --git a/configs/fedora/debug/CONFIG_DMADEVICES_DEBUG b/configs/fedora/debug/CONFIG_DMADEVICES_DEBUG
index 0b101be4e..7cd4fec86 100644
--- a/configs/fedora/debug/CONFIG_DMADEVICES_DEBUG
+++ b/configs/fedora/debug/CONFIG_DMADEVICES_DEBUG
@@ -1 +1 @@
-CONFIG_DMADEVICES_DEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
diff --git a/configs/fedora/generic/CONFIG_FW_LOADER_COMPRESS b/configs/fedora/generic/CONFIG_FW_LOADER_COMPRESS
index f95f93620..da865e898 100644
--- a/configs/fedora/generic/CONFIG_FW_LOADER_COMPRESS
+++ b/configs/fedora/generic/CONFIG_FW_LOADER_COMPRESS
@@ -1 +1 @@
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index c961c5d83..a461ec766 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1363,7 +1363,7 @@ CONFIG_DM9102=m
CONFIG_DMA_API_DEBUG=y
CONFIG_DMA_BCM2835=m
CONFIG_DMA_CMA=y
-CONFIG_DMADEVICES_DEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
# CONFIG_DMADEVICES_VDEBUG is not set
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
@@ -1937,7 +1937,7 @@ CONFIG_FUSION_SPI=m
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ce0c36483..1ff8dd030 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1921,7 +1921,7 @@ CONFIG_FUSION_SPI=m
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 4ff01777b..8e3eee74f 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1362,7 +1362,7 @@ CONFIG_DM9102=m
CONFIG_DMA_API_DEBUG=y
CONFIG_DMA_BCM2835=m
CONFIG_DMA_CMA=y
-CONFIG_DMADEVICES_DEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
# CONFIG_DMADEVICES_VDEBUG is not set
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
@@ -1961,7 +1961,7 @@ CONFIG_FUSION_SPI=m
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 475f51a90..a97205cfa 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1323,7 +1323,7 @@ CONFIG_DM9102=m
CONFIG_DMA_API_DEBUG=y
CONFIG_DMA_BCM2835=m
CONFIG_DMA_CMA=y
-CONFIG_DMADEVICES_DEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
# CONFIG_DMADEVICES_VDEBUG is not set
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
@@ -1894,7 +1894,7 @@ CONFIG_FUSION_SPI=m
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 575fc03d4..4901957e6 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1879,7 +1879,7 @@ CONFIG_FUSION_SPI=m
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index e490a2fff..c9b0a7acd 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1946,7 +1946,7 @@ CONFIG_FUSION_SPI=m
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 674b21712..cac5c943c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1146,7 +1146,7 @@ CONFIG_DM9102=m
# CONFIG_DMA_API_DEBUG_SG is not set
CONFIG_DMA_API_DEBUG=y
# CONFIG_DMA_CMA is not set
-CONFIG_DMADEVICES_DEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
# CONFIG_DMADEVICES_VDEBUG is not set
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
@@ -1690,7 +1690,7 @@ CONFIG_FUSION=y
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-i686.config b/kernel-i686.config
index a8316dc35..1f70c1655 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1673,7 +1673,7 @@ CONFIG_FUSION=y
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 988f2f0eb..42f230f64 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1059,7 +1059,7 @@ CONFIG_DM9102=m
# CONFIG_DMA_API_DEBUG_SG is not set
CONFIG_DMA_API_DEBUG=y
# CONFIG_DMA_CMA is not set
-CONFIG_DMADEVICES_DEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
# CONFIG_DMADEVICES_VDEBUG is not set
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
@@ -1537,7 +1537,7 @@ CONFIG_FUSION=y
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 6dc2a1191..4d6ef9154 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1520,7 +1520,7 @@ CONFIG_FUSION=y
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 18e189b1d..684936b2e 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1065,7 +1065,7 @@ CONFIG_DM9102=m
# CONFIG_DMA_API_DEBUG_SG is not set
CONFIG_DMA_API_DEBUG=y
# CONFIG_DMA_CMA is not set
-CONFIG_DMADEVICES_DEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
# CONFIG_DMADEVICES_VDEBUG is not set
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
@@ -1534,7 +1534,7 @@ CONFIG_FUSION_SPI=m
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d4f7bec16..bd9891b81 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1517,7 +1517,7 @@ CONFIG_FUSION_SPI=m
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 34fc2baa3..d7bca3950 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1188,7 +1188,7 @@ CONFIG_DM9102=m
# CONFIG_DMA_API_DEBUG_SG is not set
CONFIG_DMA_API_DEBUG=y
# CONFIG_DMA_CMA is not set
-CONFIG_DMADEVICES_DEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
# CONFIG_DMADEVICES_VDEBUG is not set
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
@@ -1730,7 +1730,7 @@ CONFIG_FUSION=y
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index cb5e5abfd..87172823e 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1713,7 +1713,7 @@ CONFIG_FUSION=y
CONFIG_FUTEX=y
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
# CONFIG_FW_LOADER_USER_HELPER is not set
CONFIG_FW_LOADER=y
CONFIG_FXAS21002C=m