Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora

15 files changed, 34 insertions, 13 deletions

diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index d636bd964..f57b2469f 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -600,7 +600,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_KTD253=m
 CONFIG_BACKLIGHT_LED=m
-# CONFIG_BACKLIGHT_LM3630A is not set
+CONFIG_BACKLIGHT_LM3630A=m
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
@@ -706,6 +706,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
@@ -1716,7 +1717,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
+CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_IMX_DCSS=m
 CONFIG_DRM_ITE_IT66121=m
@@ -4046,7 +4047,7 @@ CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
-# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+CONFIG_MMC_SDHCI_OF_DWCMSHC=m
 CONFIG_MMC_SDHCI_OF_ESDHC=m
 CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MMC_SDHCI_PCI=m
@@ -5781,6 +5782,7 @@ CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index e9ed13a80..25120c6c9 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -600,7 +600,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_KTD253=m
 CONFIG_BACKLIGHT_LED=m
-# CONFIG_BACKLIGHT_LM3630A is not set
+CONFIG_BACKLIGHT_LM3630A=m
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
@@ -706,6 +706,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
@@ -1708,7 +1709,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
+CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_IMX_DCSS=m
 CONFIG_DRM_ITE_IT66121=m
@@ -4022,7 +4023,7 @@ CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
-# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+CONFIG_MMC_SDHCI_OF_DWCMSHC=m
 CONFIG_MMC_SDHCI_OF_ESDHC=m
 CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MMC_SDHCI_PCI=m
@@ -5756,6 +5757,7 @@ CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 55f7748c2..5e17a082a 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -728,6 +728,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
@@ -5867,6 +5868,7 @@ CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 7747e6d33..d256c65a8 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -728,6 +728,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
@@ -5843,6 +5844,7 @@ CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 05b43c310..4a6948b5d 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -707,6 +707,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
@@ -1699,7 +1700,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
+CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_IMX is not set
 CONFIG_DRM_ITE_IT66121=m
@@ -5698,6 +5699,7 @@ CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 0b6693eb7..c3e550dab 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -707,6 +707,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
@@ -1692,7 +1693,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
+CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_IMX is not set
 CONFIG_DRM_ITE_IT66121=m
@@ -5674,6 +5675,7 @@ CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index a8c8f9aeb..70754dc54 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -505,6 +505,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 815fc48c8..cdff9f6e8 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -504,6 +504,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 9f0d484e3..eb2348794 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -509,6 +509,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 6fc6c5d0c..128469bf8 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -508,6 +508,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index d0c3c4388..b3c1c0ef1 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -552,6 +552,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 8387a142a..743097ec2 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -551,6 +551,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
diff --git a/kernel.spec b/kernel.spec
index b6cfb4da7..3755105f7 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -3020,7 +3020,10 @@ fi
 #
 #
 %changelog
-* Thu Apr 28 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.5-200]
+* Mon May 09 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.6-0]
+- fedora: arm: Enable new Rockchip 356x series drivers (Peter Robinson)
+- fedora: arm: enable DRM_I2C_NXP_TDA998X on aarch64 (Peter Robinson)
+- Add config entry for CONFIG_BLK_DEV_FD_RAWCMD (Justin M. Forbes)
 - Update changelog (Justin M. Forbes)
 
 * Thu Apr 28 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.5-0]
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch
index 786f7b7b4..4354dcaa1 100644
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@@ -106,7 +106,7 @@ index 000000000000..733a26bd887a
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 3ad5dc6be393..10a8609ca03f 100644
+index 7ef8dd5ab6f2..330889bd62b2 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 4550be50b..9c34b709b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17.5.tar.xz) = 6c2e22f74c0a91bf27c6586e440ef53110d13dd62b9b1a0f0a62d325b16d7c804edf5c10f58a4e0376f99e3e77c0daff09ba58764330aa6f4358b988e131d6ae
-SHA512 (kernel-abi-stablelists-5.17.5-200.tar.bz2) = 935dcf763820e9efe186b1e2f910a11029dfd71739611a61e7c81d97dddc4a7dd06d6ad899413d954de7685b1730cb63e67eba526e44bfb723ed65119de43d81
-SHA512 (kernel-kabi-dw-5.17.5-200.tar.bz2) = b72cc98ac387091adabf2ff5a2c8078bbb5a67d149361826b77ef5edddd9822ac9dab82b33e0778e5dad0687ef0aeb96174934f4546a861aaeeb4bbfafec4bea
+SHA512 (linux-5.17.6.tar.xz) = 952bafdd3670e467b50e7508590cfb6fb43bca1c37951cb8cd596d77a1bcb8b68dad67426218bee005d4de55a7137017b538107692bfc936a2d3a7568f898e2a
+SHA512 (kernel-abi-stablelists-5.17.6-200.tar.bz2) = 2c4b2d8eed38205da3c4ef13d896978434b490eb1157f6fd9db0e5e40ba0b7efe0373c22be115f075b78b831ecd1f946d1b58c44fbcb5930cb3fba6b55528e1a
+SHA512 (kernel-kabi-dw-5.17.6-200.tar.bz2) = fc9f35049e24964d671b85f2aa60131c0aebcfb31f0ef70112b19570d283c3730f1ca6c575f7d10b42cbcf45cde7f2995ff4e1a27aa7202d3f926ae01909b19b