summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-05-15 18:17:41 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-05-15 18:17:41 +0200
commit304c21a50e3c131368b876894d6949b1af0eb5e1 (patch)
tree0024a4f8ae604ad01d4c09a335f5df59f4405977
parent044c6e1e9e959a9fd50b247d5662aa8d970a47d9 (diff)
parent2145bfefe199ca49a5d66060af2bfd96a3004ea1 (diff)
downloadkernel-5.2.0-0.rc0.git6.1.vanilla.knurd.1.fc30.tar.gz
kernel-5.2.0-0.rc0.git6.1.vanilla.knurd.1.fc30.tar.xz
kernel-5.2.0-0.rc0.git6.1.vanilla.knurd.1.fc30.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.2.0-0.rc0.git6.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc0.git6.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc0.git6.1.vanilla.knurd.1.fc29kernel-5.2.0-0.rc0.git6.1.vanilla.knurd.1.fc28
Diffstat
-rw-r--r--configs/fedora/generic/CONFIG_TI_CPSW_ALE1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP4101
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_TI_CPSW_ALE1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA1
-rw-r--r--kernel-aarch64-debug.config1
-rw-r--r--kernel-aarch64.config1
-rw-r--r--kernel-armv7hl-debug.config5
-rw-r--r--kernel-armv7hl-lpae-debug.config1
-rw-r--r--kernel-armv7hl-lpae.config1
-rw-r--r--kernel-armv7hl.config5
-rw-r--r--kernel-i686-debug.config1
-rw-r--r--kernel-i686.config1
-rw-r--r--kernel-ppc64le-debug.config1
-rw-r--r--kernel-ppc64le.config1
-rw-r--r--kernel-s390x-debug.config1
-rw-r--r--kernel-s390x.config1
-rw-r--r--kernel-x86_64-debug.config1
-rw-r--r--kernel-x86_64.config1
20 files changed, 0 insertions, 28 deletions
diff --git a/configs/fedora/generic/CONFIG_TI_CPSW_ALE b/configs/fedora/generic/CONFIG_TI_CPSW_ALE
deleted file mode 100644
index 1bd3a2e79..000000000
--- a/configs/fedora/generic/CONFIG_TI_CPSW_ALE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TI_CPSW_ALE is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI
deleted file mode 100644
index 8b78fee27..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_CONNECTOR_DVI=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410
deleted file mode 100644
index cc463415e..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_ENCODER_TFP410=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI
deleted file mode 100644
index 2255168f6..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_DPI=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TI_CPSW_ALE b/configs/fedora/generic/arm/armv7/armv7/CONFIG_TI_CPSW_ALE
deleted file mode 100644
index 00c8a8700..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TI_CPSW_ALE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_CPSW_ALE=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA b/configs/fedora/generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA
deleted file mode 100644
index 9501e2333..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_DAVINCI_CPDMA=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 555c56f30..e5d0c2434 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6329,7 +6329,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 7a87e848b..86d44cbac 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6307,7 +6307,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 5bce57715..adb8397e5 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1495,13 +1495,10 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_NXP_PTN3460=m
CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
-CONFIG_DRM_OMAP_CONNECTOR_DVI=m
CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
CONFIG_DRM_OMAP_ENCODER_OPA362=m
-CONFIG_DRM_OMAP_ENCODER_TFP410=m
CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
CONFIG_DRM_OMAP=m
-CONFIG_DRM_OMAP_PANEL_DPI=m
CONFIG_DRM_OMAP_PANEL_DSI_CM=m
CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=m
CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
@@ -6600,7 +6597,6 @@ CONFIG_TI_ADS8344=m
CONFIG_TI_AM335X_ADC=m
CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TI_CPPI41=m
-CONFIG_TI_CPSW_ALE=m
CONFIG_TI_CPSW=m
# CONFIG_TI_CPSW_PHY_SEL is not set
CONFIG_TI_CPTS_MOD=m
@@ -6609,7 +6605,6 @@ CONFIG_TI_CPTS=y
# CONFIG_TI_DAC5571 is not set
CONFIG_TI_DAC7311=m
# CONFIG_TI_DAC7612 is not set
-CONFIG_TI_DAVINCI_CPDMA=m
CONFIG_TI_DAVINCI_EMAC=m
CONFIG_TI_DAVINCI_MDIO=m
CONFIG_TI_EDMA=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index dcbd4d790..d8cbfa8e8 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6271,7 +6271,6 @@ CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
CONFIG_TI_AEMIF=m
CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ce1a955eb..f26e5d4cb 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6250,7 +6250,6 @@ CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
CONFIG_TI_AEMIF=m
CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index d2e3ecbbe..275750647 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1488,13 +1488,10 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_NXP_PTN3460=m
CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
-CONFIG_DRM_OMAP_CONNECTOR_DVI=m
CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
CONFIG_DRM_OMAP_ENCODER_OPA362=m
-CONFIG_DRM_OMAP_ENCODER_TFP410=m
CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
CONFIG_DRM_OMAP=m
-CONFIG_DRM_OMAP_PANEL_DPI=m
CONFIG_DRM_OMAP_PANEL_DSI_CM=m
CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=m
CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
@@ -6579,7 +6576,6 @@ CONFIG_TI_ADS8344=m
CONFIG_TI_AM335X_ADC=m
CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TI_CPPI41=m
-CONFIG_TI_CPSW_ALE=m
CONFIG_TI_CPSW=m
# CONFIG_TI_CPSW_PHY_SEL is not set
CONFIG_TI_CPTS_MOD=m
@@ -6588,7 +6584,6 @@ CONFIG_TI_CPTS=y
# CONFIG_TI_DAC5571 is not set
CONFIG_TI_DAC7311=m
# CONFIG_TI_DAC7612 is not set
-CONFIG_TI_DAVINCI_CPDMA=m
CONFIG_TI_DAVINCI_EMAC=m
CONFIG_TI_DAVINCI_MDIO=m
CONFIG_TI_EDMA=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index bcbaa8203..35ac6ebee 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5773,7 +5773,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index d7d90a64a..9eab66b4c 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5752,7 +5752,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index c8e85dcef..5124772d1 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5401,7 +5401,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
# CONFIG_TICK_CPU_ACCOUNTING is not set
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index d662d8b81..d61f18ae6 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5378,7 +5378,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
# CONFIG_TICK_CPU_ACCOUNTING is not set
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 5f578a275..140483a94 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5339,7 +5339,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
# CONFIG_TICK_CPU_ACCOUNTING is not set
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 4b83ed5a1..9b5d227b9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5316,7 +5316,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
# CONFIG_TICK_CPU_ACCOUNTING is not set
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 38b9f0391..f47cf468f 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5829,7 +5829,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
# CONFIG_TICK_CPU_ACCOUNTING is not set
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 69343cb6e..dc6c15ed7 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5808,7 +5808,6 @@ CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8344=m
# CONFIG_TI_ADS8688 is not set
# CONFIG_TICK_CPU_ACCOUNTING is not set
-# CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set
generated by cgit (git 2.34.1) at 2024-05-02 17:38:49 +0000