From 4681e0d256769c612ce887bb88f282370e2626d0 Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Wed, 13 Sep 2023 14:44:54 -0300 Subject: [PATCH] kernel-6.4.16-200 * Wed Sep 13 2023 Augusto Caringi [6.4.16-0] - Config change required for build (CONFIG_VIDEO_CAMERA_SENSOR) (Augusto Caringi) - Add nvme bug to BugsFixed for 6.4.16 (Justin M. Forbes) - Revert "misc: rtsx: judge ASPM Mode to set PETXCFG Reg" (Justin M. Forbes) - Fix RHeL config for 6.4.16 (Justin M. Forbes) - Linux v6.4.16 Resolves: Signed-off-by: Augusto Caringi --- Patchlist.changelog | 3 + kernel-aarch64-16k-debug-fedora.config | 1 + kernel-aarch64-16k-fedora.config | 1 + kernel-aarch64-64k-debug-rhel.config | 3 +- kernel-aarch64-64k-rhel.config | 3 +- kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-debug-rhel.config | 3 +- kernel-aarch64-fedora.config | 1 + kernel-aarch64-rhel.config | 3 +- kernel-aarch64-rt-debug-rhel.config | 3 +- kernel-aarch64-rt-rhel.config | 3 +- kernel-armv7hl-debug-fedora.config | 1 + kernel-armv7hl-fedora.config | 1 + kernel-armv7hl-lpae-debug-fedora.config | 1 + kernel-armv7hl-lpae-fedora.config | 1 + kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-debug-rhel.config | 3 +- kernel-ppc64le-fedora.config | 1 + kernel-ppc64le-rhel.config | 3 +- kernel-s390x-debug-fedora.config | 1 + kernel-s390x-debug-rhel.config | 3 +- kernel-s390x-fedora.config | 1 + kernel-s390x-rhel.config | 3 +- kernel-s390x-zfcpdump-rhel.config | 3 +- kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-debug-rhel.config | 3 +- kernel-x86_64-fedora.config | 1 + kernel-x86_64-rhel.config | 3 +- kernel-x86_64-rt-debug-rhel.config | 3 +- kernel-x86_64-rt-rhel.config | 3 +- kernel.spec | 15 +- patch-6.4-redhat.patch | 254 ++++++++++++++++++------ sources | 6 +- 33 files changed, 249 insertions(+), 88 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 06f718004..2bcdeb640 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/70526bbe245f4197ba74770f8f5c0c4dc4bbb484 + 70526bbe245f4197ba74770f8f5c0c4dc4bbb484 Revert "misc: rtsx: judge ASPM Mode to set PETXCFG Reg" + "https://gitlab.com/cki-project/kernel-ark/-/commit"/f1d87b42e9ac0ca6233ba1906ddcec6407510018 f1d87b42e9ac0ca6233ba1906ddcec6407510018 tpm: Enable hwrng only for Pluton on AMD CPUs diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 1a7552712..a0f3c4699 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -8967,6 +8967,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CX18_ALSA=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 7f608d27e..ac96382fd 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -8938,6 +8938,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CX18_ALSA=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index bc5a79e89..0e771224a 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -7241,6 +7241,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7378,7 +7379,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 099ae7681..e76217aac 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -7216,6 +7216,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7353,7 +7354,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 315f33e15..dd4334381 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -8967,6 +8967,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CX18_ALSA=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index a5937d0fe..e283804bb 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -7237,6 +7237,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7374,7 +7375,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 4f63b5ada..8520b3da8 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -8938,6 +8938,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CX18_ALSA=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index d4a9189ac..30faca110 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -7212,6 +7212,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7349,7 +7350,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 3fea361a0..303d09b9d 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -7409,6 +7409,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7581,7 +7582,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 4f9598299..a210884c5 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -7384,6 +7384,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7556,7 +7557,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 1d5acf86a..84374ca8b 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -8997,6 +8997,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CX18_ALSA=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 0c655c7a1..1c73d85e3 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -8970,6 +8970,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CX18_ALSA=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 45dbd402a..77b009027 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -8759,6 +8759,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CX18_ALSA=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 169384a6c..73cf7d806 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -8732,6 +8732,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CX18_ALSA=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 4eef21a10..603eaa246 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -7497,6 +7497,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX18=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 7cbdda90f..a77e86227 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -6787,6 +6787,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -6924,7 +6925,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 01c83adc2..12a987785 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -7466,6 +7466,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX18=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f335b5f8d..8b6ece17b 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -6764,6 +6764,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -6901,7 +6902,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 89d29ba53..d68e537eb 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -7445,6 +7445,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX18=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 3f054c15d..242825beb 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -6775,6 +6775,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -6912,7 +6913,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 1739bdbbe..4c72b7718 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -7414,6 +7414,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX18=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 5bc2b8ca5..c0ceb675f 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -6752,6 +6752,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -6889,7 +6890,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 29396d987..a060e22a5 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6778,6 +6778,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -6915,7 +6916,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index d5d77b086..18d46d11a 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7928,6 +7928,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX18=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 0fbf50dd7..95d4cc3f5 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -7036,6 +7036,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7173,7 +7174,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index ba2635743..94b76c9f8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7898,6 +7898,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX18=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 9042bdd1e..8bfd1ad02 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -7012,6 +7012,7 @@ CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_BT848=m CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7149,7 +7150,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index a05383150..4a61f166f 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -7208,6 +7208,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7380,7 +7381,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 2f79cbd6c..8e36e52b9 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -7184,6 +7184,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7356,7 +7357,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel.spec b/kernel.spec index bc7e03d08..ffa70f886 100644 --- a/kernel.spec +++ b/kernel.spec @@ -171,18 +171,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.4.15 -%define specversion 6.4.15 +%define specrpmversion 6.4.16 +%define specversion 6.4.16 %define patchversion 6.4 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.4.15 +%define tarfile_release 6.4.16 # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.4.15 +%define kabiversion 6.4.16 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3817,6 +3817,13 @@ fi\ # # %changelog +* Wed Sep 13 2023 Augusto Caringi [6.4.16-0] +- Config change required for build (CONFIG_VIDEO_CAMERA_SENSOR) (Augusto Caringi) +- Add nvme bug to BugsFixed for 6.4.16 (Justin M. Forbes) +- Revert "misc: rtsx: judge ASPM Mode to set PETXCFG Reg" (Justin M. Forbes) +- Fix RHeL config for 6.4.16 (Justin M. Forbes) +- Linux v6.4.16 + * Wed Sep 06 2023 Augusto Caringi [6.4.15-0] - Add TPM bug to BugsFixed (Justin M. Forbes) - tpm: Enable hwrng only for Pluton on AMD CPUs (Jarkko Sakkinen) diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch index 40e55150a..353d0bef5 100644 --- a/patch-6.4-redhat.patch +++ b/patch-6.4-redhat.patch @@ -12,7 +12,6 @@ drivers/ata/libahci.c | 18 +++ drivers/char/ipmi/ipmi_dmi.c | 15 +++ drivers/char/ipmi/ipmi_msghandler.c | 16 ++- - drivers/char/tpm/tpm_crb.c | 33 ++---- drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 +++++++++++++++------ drivers/firmware/efi/secureboot.c | 38 +++++++ @@ -21,6 +20,12 @@ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- drivers/iommu/iommu.c | 22 ++++ + drivers/misc/cardreader/rts5227.c | 2 +- + drivers/misc/cardreader/rts5228.c | 18 +++ + drivers/misc/cardreader/rts5249.c | 3 +- + drivers/misc/cardreader/rts5260.c | 18 +++ + drivers/misc/cardreader/rts5261.c | 18 +++ + drivers/misc/cardreader/rtsx_pcr.c | 5 +- drivers/pci/quirks.c | 24 ++++ drivers/usb/core/hub.c | 7 ++ include/linux/efi.h | 22 ++-- @@ -38,10 +43,10 @@ security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 40 files changed, 526 insertions(+), 216 deletions(-) + 45 files changed, 576 insertions(+), 197 deletions(-) diff --git a/Makefile b/Makefile -index 212d1c7e4a1a..85f5a8b70878 100644 +index 34ea74d74476..9c4feee0aaa9 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -120,10 +125,10 @@ index b0d00032479d..afb9544fb007 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index f44f70de9661..829255d50d01 100644 +index 9d74b037b3a3..63a827172165 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c -@@ -2517,3 +2517,8 @@ int ipl_report_free(struct ipl_report *report) +@@ -2519,3 +2519,8 @@ int ipl_report_free(struct ipl_report *report) } #endif @@ -430,57 +435,6 @@ index 186f1fee7534..93e3a76596ff 100644 mutex_lock(&ipmi_interfaces_mutex); rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); -diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c -index 9eb1a1859012..a5dbebb1acfc 100644 ---- a/drivers/char/tpm/tpm_crb.c -+++ b/drivers/char/tpm/tpm_crb.c -@@ -463,28 +463,6 @@ static bool crb_req_canceled(struct tpm_chip *chip, u8 status) - return (cancel & CRB_CANCEL_INVOKE) == CRB_CANCEL_INVOKE; - } - --static int crb_check_flags(struct tpm_chip *chip) --{ -- u32 val; -- int ret; -- -- ret = crb_request_locality(chip, 0); -- if (ret) -- return ret; -- -- ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL); -- if (ret) -- goto release; -- -- if (val == 0x414D4400U /* AMD */) -- chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED; -- --release: -- crb_relinquish_locality(chip, 0); -- -- return ret; --} -- - static const struct tpm_class_ops tpm_crb = { - .flags = TPM_OPS_AUTO_STARTUP, - .status = crb_status, -@@ -826,9 +804,14 @@ static int crb_acpi_add(struct acpi_device *device) - if (rc) - goto out; - -- rc = crb_check_flags(chip); -- if (rc) -- goto out; -+#ifdef CONFIG_X86 -+ /* A quirk for https://www.amd.com/en/support/kb/faq/pa-410 */ -+ if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD && -+ priv->sm != ACPI_TPM2_COMMAND_BUFFER_WITH_PLUTON) { -+ dev_info(dev, "Disabling hwrng\n"); -+ chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED; -+ } -+#endif /* CONFIG_X86 */ - - rc = tpm_chip_register(chip); - diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index b51f2a4c821e..be31d32aba53 100644 --- a/drivers/firmware/efi/Makefile @@ -1064,7 +1018,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index f1dcfa3f1a1b..62fa35de72ac 100644 +index 88e7154f846d..64c31fa51172 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1103,6 +1057,174 @@ index f1dcfa3f1a1b..62fa35de72ac 100644 /* * Changes the default domain of an iommu group * +diff --git a/drivers/misc/cardreader/rts5227.c b/drivers/misc/cardreader/rts5227.c +index 3dae5e3a1697..d676cf63a966 100644 +--- a/drivers/misc/cardreader/rts5227.c ++++ b/drivers/misc/cardreader/rts5227.c +@@ -195,7 +195,7 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr) + } + } + +- if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG) ++ if (option->force_clkreq_0) + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, + FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); + else +diff --git a/drivers/misc/cardreader/rts5228.c b/drivers/misc/cardreader/rts5228.c +index f4ab09439da7..cfebad51d1d8 100644 +--- a/drivers/misc/cardreader/rts5228.c ++++ b/drivers/misc/cardreader/rts5228.c +@@ -435,10 +435,17 @@ static void rts5228_init_from_cfg(struct rtsx_pcr *pcr) + option->ltr_enabled = false; + } + } ++ ++ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN ++ | PM_L1_1_EN | PM_L1_2_EN)) ++ option->force_clkreq_0 = false; ++ else ++ option->force_clkreq_0 = true; + } + + static int rts5228_extra_init_hw(struct rtsx_pcr *pcr) + { ++ struct rtsx_cr_option *option = &pcr->option; + + rtsx_pci_write_register(pcr, RTS5228_AUTOLOAD_CFG1, + CD_RESUME_EN_MASK, CD_RESUME_EN_MASK); +@@ -469,6 +476,17 @@ static int rts5228_extra_init_hw(struct rtsx_pcr *pcr) + else + rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00); + ++ /* ++ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced ++ * to drive low, and we forcibly request clock. ++ */ ++ if (option->force_clkreq_0) ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); ++ else ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); ++ + rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB); + + if (pcr->rtd3_en) { +diff --git a/drivers/misc/cardreader/rts5249.c b/drivers/misc/cardreader/rts5249.c +index 47ab72a43256..91d240dd68fa 100644 +--- a/drivers/misc/cardreader/rts5249.c ++++ b/drivers/misc/cardreader/rts5249.c +@@ -327,11 +327,12 @@ static int rts5249_extra_init_hw(struct rtsx_pcr *pcr) + } + } + ++ + /* + * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced + * to drive low, and we forcibly request clock. + */ +- if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG) ++ if (option->force_clkreq_0) + rtsx_pci_write_register(pcr, PETXCFG, + FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); + else +diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c +index 79b18f6f73a8..9b42b20a3e5a 100644 +--- a/drivers/misc/cardreader/rts5260.c ++++ b/drivers/misc/cardreader/rts5260.c +@@ -517,10 +517,17 @@ static void rts5260_init_from_cfg(struct rtsx_pcr *pcr) + option->ltr_enabled = false; + } + } ++ ++ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN ++ | PM_L1_1_EN | PM_L1_2_EN)) ++ option->force_clkreq_0 = false; ++ else ++ option->force_clkreq_0 = true; + } + + static int rts5260_extra_init_hw(struct rtsx_pcr *pcr) + { ++ struct rtsx_cr_option *option = &pcr->option; + + /* Set mcu_cnt to 7 to ensure data can be sampled properly */ + rtsx_pci_write_register(pcr, 0xFC03, 0x7F, 0x07); +@@ -539,6 +546,17 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr) + + rts5260_init_hw(pcr); + ++ /* ++ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced ++ * to drive low, and we forcibly request clock. ++ */ ++ if (option->force_clkreq_0) ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); ++ else ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); ++ + rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00); + + return 0; +diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c +index 94af6bf8a25a..b1e76030cafd 100644 +--- a/drivers/misc/cardreader/rts5261.c ++++ b/drivers/misc/cardreader/rts5261.c +@@ -498,10 +498,17 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr) + option->ltr_enabled = false; + } + } ++ ++ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN ++ | PM_L1_1_EN | PM_L1_2_EN)) ++ option->force_clkreq_0 = false; ++ else ++ option->force_clkreq_0 = true; + } + + static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) + { ++ struct rtsx_cr_option *option = &pcr->option; + u32 val; + + rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG1, +@@ -547,6 +554,17 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) + else + rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00); + ++ /* ++ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced ++ * to drive low, and we forcibly request clock. ++ */ ++ if (option->force_clkreq_0) ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); ++ else ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); ++ + rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB); + + if (pcr->rtd3_en) { +diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c +index a3f4b52bb159..32b7783e9d4f 100644 +--- a/drivers/misc/cardreader/rtsx_pcr.c ++++ b/drivers/misc/cardreader/rtsx_pcr.c +@@ -1326,11 +1326,8 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr) + return err; + } + +- if (pcr->aspm_mode == ASPM_MODE_REG) { ++ if (pcr->aspm_mode == ASPM_MODE_REG) + rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30); +- rtsx_pci_write_register(pcr, PETXCFG, +- FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); +- } + + /* No CD interrupt if probing driver with card inserted. + * So we need to initialize pcr->card_exist here. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index b7c65193e786..fd55846ced2b 100644 --- a/drivers/pci/quirks.c @@ -1139,10 +1261,10 @@ index b7c65193e786..fd55846ced2b 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 97a0f8faea6e..d837548d2024 100644 +index 8a576326b359..c91f5bd30e3d 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5734,6 +5734,13 @@ static void hub_event(struct work_struct *work) +@@ -5790,6 +5790,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -1225,10 +1347,10 @@ index 571d1a6e1b74..8f786e38de3f 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 6bb55e61e8e8..3bf124aca5ff 100644 +index fb9f5f00a778..e97742229b18 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h -@@ -403,6 +403,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) +@@ -404,6 +404,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) #endif /* CONFIG_BPF_SYSCALL */ LSM_HOOK(int, 0, locked_down, enum lockdown_reason what) @@ -1262,10 +1384,10 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index e2734e9e44d5..52344c344e7a 100644 +index 274c75fa2e27..f22f218de6f1 100644 --- a/include/linux/security.h +++ b/include/linux/security.h -@@ -482,6 +482,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); +@@ -483,6 +483,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen); int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); int security_locked_down(enum lockdown_reason what); @@ -1273,7 +1395,7 @@ index e2734e9e44d5..52344c344e7a 100644 #else /* CONFIG_SECURITY */ static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) -@@ -1388,6 +1389,10 @@ static inline int security_locked_down(enum lockdown_reason what) +@@ -1394,6 +1395,10 @@ static inline int security_locked_down(enum lockdown_reason what) { return 0; } @@ -1466,10 +1588,10 @@ index 68d19632aeb7..ef348935b6ff 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index d5ff7ff45b77..ac7d177a5fea 100644 +index 521f74e77dd1..c2d530463f53 100644 --- a/security/security.c +++ b/security/security.c -@@ -5167,6 +5167,18 @@ int security_locked_down(enum lockdown_reason what) +@@ -5181,6 +5181,18 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); diff --git a/sources b/sources index db6b0a869..02e6fc4da 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4.15.tar.xz) = 9b38a23e65e15a4efef724d3f308c415fce68d138df653de18b57bbb8cb61b1281af016e74898db3387f7b75b9cefd7361339e0aa50d8344bb1e3fc7469e3ee6 -SHA512 (kernel-abi-stablelists-6.4.15.tar.bz2) = 81239647b9390ce9b203ce865002222b62d060984f47f2caeddb060bebc5c7daddad194e3a1e4dc63cc39ce0edf3b2d8fb492e8a8454574c6d1c228a5aed95b9 -SHA512 (kernel-kabi-dw-6.4.15.tar.bz2) = cebea1321199f828844453a4ede76f3dd182c88fd5a83a0d28e2b14cda501de3b30902e0301bac4d52444b9d14151a1908166ccc1500dc90f667df7e4b3a8b37 +SHA512 (linux-6.4.16.tar.xz) = 772717109a9bbab39ec95dd796bd9dff22a2b92dbf6ecac21223e89dba59b83b3dbcbcc91eaf4b3a4318bd5aaf00941100d58f5a324234239099db75495ceb27 +SHA512 (kernel-abi-stablelists-6.4.16.tar.bz2) = c66eb88b02d031e084f08b78be845533288df52b7a4ab5b0cdec9d93a2c09f245906d687586b23974d1d61b516cea45dd054d6ac91c3dfb31ac69c68809abd07 +SHA512 (kernel-kabi-dw-6.4.16.tar.bz2) = cf54c44425ad9fbb32722b423a6a7c79ba1e895164dba2205aeb2e160477e734411999a10bcbcc0de2082950d13d129d2e5c3b5058c6c2347b5d728deac98e16