summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-04-13 08:06:48 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-04-13 08:06:48 +0200
commit4bb155395232837b438c91d592129f32883899e6 (patch)
tree0cd3ff6d11e9bd42fc640e3593163da8725e4b8a
parent4038f2fbc29879d2260f85627030b868ca590894 (diff)
parentf5cc9f5213246050e142153d9f9f0fb138b6ce69 (diff)
downloadkernel-4bb155395232837b438c91d592129f32883899e6.tar.gz
kernel-4bb155395232837b438c91d592129f32883899e6.tar.xz
kernel-4bb155395232837b438c91d592129f32883899e6.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r--configs/fedora/generic/CONFIG_DRM_DUMB_VGA_DAC1
-rw-r--r--configs/fedora/generic/arm/CONFIG_DRM_DUMB_VGA_DAC1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA1941
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config1
-rw-r--r--kernel-armv7hl-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-fedora.config1
-rw-r--r--kernel-i686-debug-fedora.config1
-rw-r--r--kernel-i686-fedora.config1
-rw-r--r--kernel-ppc64le-debug-fedora.config1
-rw-r--r--kernel-ppc64le-fedora.config1
-rw-r--r--kernel-s390x-debug-fedora.config1
-rw-r--r--kernel-s390x-fedora.config1
-rw-r--r--kernel-x86_64-debug-fedora.config1
-rw-r--r--kernel-x86_64-fedora.config1
17 files changed, 0 insertions, 19 deletions
diff --git a/configs/fedora/generic/CONFIG_DRM_DUMB_VGA_DAC b/configs/fedora/generic/CONFIG_DRM_DUMB_VGA_DAC
deleted file mode 100644
index 9d926e169..000000000
--- a/configs/fedora/generic/CONFIG_DRM_DUMB_VGA_DAC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_DUMB_VGA_DAC is not set
diff --git a/configs/fedora/generic/arm/CONFIG_DRM_DUMB_VGA_DAC b/configs/fedora/generic/arm/CONFIG_DRM_DUMB_VGA_DAC
deleted file mode 100644
index 9bd8d9fd1..000000000
--- a/configs/fedora/generic/arm/CONFIG_DRM_DUMB_VGA_DAC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_DUMB_VGA_DAC=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194 b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194
deleted file mode 100644
index 5484caeef..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCIE_TEGRA194=m
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 8426f9f42..bd3135bfd 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1518,7 +1518,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_CEC=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
@@ -4592,7 +4591,6 @@ CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
# CONFIG_PCIE_ROCKCHIP_HOST is not set
CONFIG_PCIE_TEGRA194_HOST=m
-CONFIG_PCIE_TEGRA194=m
CONFIG_PCIE_XILINX_NWL=y
CONFIG_PCIE_XILINX=y
# CONFIG_PCI_FTPCI100 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index bc5b3e6c7..fc5a77861 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1510,7 +1510,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_CEC=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
@@ -4572,7 +4571,6 @@ CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
# CONFIG_PCIE_ROCKCHIP_HOST is not set
CONFIG_PCIE_TEGRA194_HOST=m
-CONFIG_PCIE_TEGRA194=m
CONFIG_PCIE_XILINX_NWL=y
CONFIG_PCIE_XILINX=y
# CONFIG_PCI_FTPCI100 is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 925f29535..71a57a85b 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1506,7 +1506,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_CEC=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 96b1dd679..9a731e1d9 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1499,7 +1499,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_CEC=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 2d0488f64..6f6d0beed 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1474,7 +1474,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_CEC=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index aec87d8f3..d8613c0ae 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1467,7 +1467,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_CEC=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 176ef717b..c99fc51e4 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -1263,7 +1263,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
# CONFIG_DRM_ETNAVIV is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 2e2dc494b..decda4f38 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -1254,7 +1254,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
# CONFIG_DRM_ETNAVIV is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index f5d80d4ab..34acc189d 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1166,7 +1166,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
# CONFIG_DRM_ETNAVIV is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 9dee7aff2..5772c5783 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1157,7 +1157,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
# CONFIG_DRM_ETNAVIV is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index e5d672047..0f9a0f0e8 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1172,7 +1172,6 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
# CONFIG_DRM_ETNAVIV is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 32a32adb4..d46018aa2 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1163,7 +1163,6 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
# CONFIG_DRM_ETNAVIV is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 374f323e7..10dd1fa79 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1301,7 +1301,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
# CONFIG_DRM_ETNAVIV is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index f16816880..4f5f4ca76 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1292,7 +1292,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DP_CEC is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
# CONFIG_DRM_ETNAVIV is not set