Three configs have been renamed and/or changed behaviour.
Clean that by using the new config name.
With the name change to DRM_SIMPLE_BRIDGE the related
DRM_DISPLAY_CONNECTOR got introduced, enable that additionally.
Then refresh the defconfig with make defconfig savedefconfig.
The refreshed defconfig does result in a not changed .config.
Applies on linux-next/master tag: next-20200407
Changes in v2:
- additional patch adding DRM_DISPLAY_CONNECTOR as recommended by Geert and Laurent
- add reviewed-by tags
Max Krummenacher (5):
arm64: defconfig: DRM_DUMB_VGA_DAC: follow changed config symbol name
arm64: defconfig: add DRM_DISPLAY_CONNECTOR
arm64: defconfig: PCIE_TEGRA194: follow changed config symbol name
arm64: defconfig: ARCH_R8A7795: follow changed config symbol name
arm64: defconfig: refresh
arch/arm64/configs/defconfig | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
--
2.20.1
This occurrence wasn't changed in the original rename commit.
Fixes commit 0411374bdf2b3 ("drm/bridge: dumb-vga-dac: Rename driver to
simple-bridge").
Signed-off-by: Max Krummenacher <[email protected]>
Reviewed-by: Laurent Pinchart <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
---
Changes in v2: None
arch/arm64/configs/defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 24e534d850454..ae908c3f43c76 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -610,7 +610,7 @@ CONFIG_DRM_MSM=m
CONFIG_DRM_TEGRA=m
CONFIG_DRM_PANEL_LVDS=m
CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
CONFIG_DRM_SII902X=m
CONFIG_DRM_THINE_THC63LVD1024=m
--
2.20.1
Refresh with make defconfig savedefconfig
Signed-off-by: Max Krummenacher <[email protected]>
---
Changes in v2:
- add reviewed-by tags
arch/arm64/configs/defconfig | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 4a361734cfc71..a4baafe01c346 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -165,9 +165,9 @@ CONFIG_QRTR_SMD=m
CONFIG_QRTR_TUN=m
CONFIG_BPF_JIT=y
CONFIG_CAN=m
+CONFIG_CAN_FLEXCAN=m
CONFIG_CAN_RCAR=m
CONFIG_CAN_RCAR_CANFD=m
-CONFIG_CAN_FLEXCAN=m
CONFIG_BT=m
CONFIG_BT_HIDP=m
# CONFIG_BT_HS is not set
@@ -202,20 +202,19 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y
CONFIG_PCIE_ROCKCHIP_HOST=m
CONFIG_PCIE_BRCMSTB=m
CONFIG_PCI_LAYERSCAPE=y
-CONFIG_PCIE_LAYERSCAPE_GEN4=y
CONFIG_PCI_HISI=y
CONFIG_PCIE_QCOM=y
CONFIG_PCIE_ARMADA_8K=y
CONFIG_PCIE_KIRIN=y
CONFIG_PCIE_HISI_STB=y
CONFIG_PCIE_TEGRA194_HOST=m
+CONFIG_PCIE_LAYERSCAPE_GEN4=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_HISILICON_LPC=y
CONFIG_SIMPLE_PM_BUS=y
-CONFIG_FSL_MC_BUS=y
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
@@ -494,10 +493,10 @@ CONFIG_SENSORS_INA3221=m
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_CPU_THERMAL=y
CONFIG_THERMAL_EMULATION=y
-CONFIG_QORIQ_THERMAL=m
-CONFIG_SUN8I_THERMAL=y
CONFIG_IMX_SC_THERMAL=m
CONFIG_IMX8MM_THERMAL=m
+CONFIG_QORIQ_THERMAL=m
+CONFIG_SUN8I_THERMAL=y
CONFIG_ROCKCHIP_THERMAL=m
CONFIG_RCAR_THERMAL=y
CONFIG_RCAR_GEN3_THERMAL=y
@@ -610,10 +609,10 @@ CONFIG_DRM_MSM=m
CONFIG_DRM_TEGRA=m
CONFIG_DRM_PANEL_LVDS=m
CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_SIMPLE_BRIDGE=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_SII902X=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
CONFIG_DRM_THINE_THC63LVD1024=m
CONFIG_DRM_TI_SN65DSI86=m
CONFIG_DRM_I2C_ADV7511=m
@@ -661,7 +660,6 @@ CONFIG_SND_SOC_WSA881X=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
CONFIG_I2C_HID=m
-CONFIG_USB_CONN_GPIO=m
CONFIG_USB=y
CONFIG_USB_OTG=y
CONFIG_USB_XHCI_HCD=y
@@ -796,14 +794,13 @@ CONFIG_QCOM_A53PLL=y
CONFIG_QCOM_CLK_APCS_MSM8916=y
CONFIG_QCOM_CLK_SMD_RPM=y
CONFIG_QCOM_CLK_RPMH=y
-CONFIG_IPQ_GCC_8074=y
CONFIG_IPQ_GCC_6018=y
+CONFIG_IPQ_GCC_8074=y
CONFIG_MSM_GCC_8916=y
CONFIG_MSM_GCC_8994=y
CONFIG_MSM_MMCC_8996=y
CONFIG_MSM_GCC_8998=y
CONFIG_QCS_GCC_404=y
-CONFIG_SDM_GCC_845=y
CONFIG_SDM_GPUCC_845=y
CONFIG_SDM_DISPCC_845=y
CONFIG_SM_GCC_8150=y
@@ -932,10 +929,10 @@ CONFIG_FPGA_REGION=m
CONFIG_OF_FPGA_REGION=m
CONFIG_TEE=y
CONFIG_OPTEE=y
+CONFIG_MUX_MMIO=y
CONFIG_SLIMBUS=m
CONFIG_SLIM_QCOM_CTRL=m
CONFIG_SLIM_QCOM_NGD_CTRL=m
-CONFIG_MUX_MMIO=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
--
2.20.1
On Wed, Apr 8, 2020 at 4:31 PM Max Krummenacher <[email protected]> wrote:
>
> Three configs have been renamed and/or changed behaviour.
> Clean that by using the new config name.
> With the name change to DRM_SIMPLE_BRIDGE the related
> DRM_DISPLAY_CONNECTOR got introduced, enable that additionally.
>
> Then refresh the defconfig with make defconfig savedefconfig.
>
> The refreshed defconfig does result in a not changed .config.
>
> Applies on linux-next/master tag: next-20200407
>
>
> Changes in v2:
> - additional patch adding DRM_DISPLAY_CONNECTOR as recommended by Geert and Laurent
> - add reviewed-by tags
Thank you for the series!
When you are reasonably confident that you have done these patches correctly,
feel free to send them to [email protected] so they make it into the
lore.kernel.org
patchwork instance and we pick them up from there.
From the description, I guess the first four are supposed to be
applied as bugfixes
for v5.7, and the last one is meant as a cleanup and queued for v5.8? Please
indicated in the cover letter what you think should happen with them, then we
can either follow that suggestion or see if anyone disagrees.
For the last patch, I want a better description, as you do not say how you made
sure that nothing else changed that needs to be addressed with a separate
patch. From the diffstat "1 file changed, 7 insertions(+), 10 deletions(-)", it
sounds like seven options got moved around but did not change behavior,
but three others have either disappeared or also got renamed. I could look
more closely to see what happened exactly, but I'd prefer this to be obvious
from the changelog.
Arnd