diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-11-09 10:17:09 -0600 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-11-09 10:17:09 -0600 |
commit | 863d61daf8bb1eb7b271dc8a4ccc12a6289e987c (patch) | |
tree | 3794019664c0ad492a0bd77fe673ec4cf6f6f061 | |
parent | 323afd9d3950b6e266dcc14eb24f1bf1fb00e107 (diff) | |
download | kernel-863d61daf8bb1eb7b271dc8a4ccc12a6289e987c.tar.gz kernel-863d61daf8bb1eb7b271dc8a4ccc12a6289e987c.tar.xz kernel-863d61daf8bb1eb7b271dc8a4ccc12a6289e987c.zip |
kernel-5.16-0.rc0.20211109gitd2f38a3c6507.9
* Tue Nov 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211109gitd2f38a3c6507.9]
- arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann)
- drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
28 files changed, 143 insertions, 63 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 688d4cfe6..0c6a71d1c 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 7 +RHEL_RELEASE = 9 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index eac2a601b..e923259e3 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/ca3bff2fbfde026a32a900a47e61443e79f64464 + ca3bff2fbfde026a32a900a47e61443e79f64464 arm64: cpufeature: Export this_cpu_has_cap helper + +https://gitlab.com/cki-project/kernel-ark/-/commit/b7fc3a511b8d75b54b1bc4bd5f6a2d571bd00b5e + b7fc3a511b8d75b54b1bc4bd5f6a2d571bd00b5e drm/virtio: Fix NULL dereference error in virtio_gpu_poll + https://gitlab.com/cki-project/kernel-ark/-/commit/07b3d9b051aa347237b4c637a1984c1915c750b2 07b3d9b051aa347237b4c637a1984c1915c750b2 Enable e1000 in rhel9 as unsupported diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 4be6c7b4c..927349a6f 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1541,9 +1541,9 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2486,6 +2486,7 @@ CONFIG_GPIO_XGENE=y CONFIG_GPIO_XLP=m # CONFIG_GPIO_XRA1403 is not set CONFIG_GPIO_ZYNQ=m +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set @@ -4894,6 +4895,7 @@ CONFIG_N_GSM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -8595,7 +8597,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index bb406f1e7..a6800173a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3977,6 +3977,7 @@ CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -6932,7 +6933,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 6b4715250..5ef9e1d2f 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1541,9 +1541,9 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2470,6 +2470,7 @@ CONFIG_GPIO_XGENE=y CONFIG_GPIO_XLP=m # CONFIG_GPIO_XRA1403 is not set CONFIG_GPIO_ZYNQ=m +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set @@ -4870,6 +4871,7 @@ CONFIG_N_GSM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -8569,7 +8571,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index ce0ae6b50..8f44cceec 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3956,6 +3956,7 @@ CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -6908,7 +6909,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 454db6062..643b4392d 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1535,9 +1535,9 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2509,6 +2509,7 @@ CONFIG_GPIO_XILINX=y # CONFIG_GPIO_XRA1403 is not set # CONFIG_GPIO_ZEVIO is not set CONFIG_GPIO_ZYNQ=m +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set CONFIG_GS_FPGABOOT=m @@ -4969,6 +4970,7 @@ CONFIG_N_GSM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -8868,7 +8870,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 4b9103171..f21a10303 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1535,9 +1535,9 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2494,6 +2494,7 @@ CONFIG_GPIO_XILINX=y # CONFIG_GPIO_XRA1403 is not set # CONFIG_GPIO_ZEVIO is not set CONFIG_GPIO_ZYNQ=m +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set CONFIG_GS_FPGABOOT=m @@ -4946,6 +4947,7 @@ CONFIG_N_GSM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -8843,7 +8845,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 5eb3f741a..aa689b682 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1503,9 +1503,9 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2454,6 +2454,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set # CONFIG_GPIO_ZEVIO is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set @@ -4865,6 +4866,7 @@ CONFIG_N_GSM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -8601,7 +8603,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 89463f692..efc910a1d 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1503,9 +1503,9 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2439,6 +2439,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set # CONFIG_GPIO_ZEVIO is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set @@ -4842,6 +4843,7 @@ CONFIG_N_GSM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -8576,7 +8578,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 1b1281386..7bc0e85bb 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1239,9 +1239,9 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2143,6 +2143,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_WS16C48 is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index bb824bc4d..f3595fcde 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -1238,9 +1238,9 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2126,6 +2126,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_WS16C48 is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 9e7c58dce..972fd0f03 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1179,9 +1179,9 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2002,6 +2002,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_WS16C48 is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set @@ -4213,6 +4214,7 @@ CONFIG_N_GSM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -7381,7 +7383,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 1d137011e..db647ddd1 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3785,6 +3785,7 @@ CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -6688,7 +6689,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f38bae621..4dd1a462b 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1178,9 +1178,9 @@ CONFIG_DEBUGGER=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -1985,6 +1985,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_WS16C48 is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set @@ -4189,6 +4190,7 @@ CONFIG_N_GSM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -7355,7 +7357,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 7c01a87f6..87e9f65ac 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3767,6 +3767,7 @@ CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -6668,7 +6669,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 2cf9d9add..ccc40c701 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1190,9 +1190,9 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -1999,6 +1999,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_WS16C48 is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set @@ -4193,6 +4194,7 @@ CONFIG_NFT_XFRM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -7341,7 +7343,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index d5e6ce29d..8686d5f53 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3765,6 +3765,7 @@ CONFIG_N_GSM=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -6647,7 +6648,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 9b6385a04..ea981f4f6 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1189,9 +1189,9 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -1982,6 +1982,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_WS16C48 is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set @@ -4169,6 +4170,7 @@ CONFIG_NFT_XFRM=m CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m @@ -7315,7 +7317,7 @@ CONFIG_VIDEO_VS6624=m # CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 64505300f..af11eaeba 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3747,6 +3747,7 @@ CONFIG_N_GSM=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -6627,7 +6628,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 7fe5555ab..6d52d48e3 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3769,6 +3769,7 @@ CONFIG_N_GSM=y # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -6661,7 +6662,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 68a105c3c..1621204f5 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1278,9 +1278,9 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2182,6 +2182,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_WS16C48 is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 82f820524..a24545cb3 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -6712,6 +6712,7 @@ CONFIG_UWB_WHCI=m # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VBOXGUEST is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set @@ -6889,7 +6890,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 6226ddf3e..e61274ce1 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1277,9 +1277,9 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y +# CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO=y @@ -2165,6 +2165,7 @@ CONFIG_GPIO_WM8994=m # CONFIG_GPIO_WS16C48 is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XRA1403 is not set +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_GREENASIA_FF=y # CONFIG_GREYBUS is not set # CONFIG_GS_FPGABOOT is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index cde7a4671..5d60cda8d 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -6689,6 +6689,7 @@ CONFIG_UWB_WHCI=m # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VBOXGUEST is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set @@ -6866,7 +6867,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel.spec b/kernel.spec index 765ab0e46..00e8d9fe1 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc0.20211108git6b75d88fa81b.7 +%global distro_build 0.rc0.20211109gitd2f38a3c6507.9 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc0.20211108git6b75d88fa81b.7 +%define pkgrelease 0.rc0.20211109gitd2f38a3c6507.9 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20211108git6b75d88fa81b.7%{?buildid}%{?dist} +%define specrelease 0.rc0.20211109gitd2f38a3c6507.9%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -682,7 +682,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-11222-g6b75d88fa81b.tar.xz +Source0: linux-5.15-11645-gd2f38a3c6507.tar.xz Source1: Makefile.rhelver @@ -1374,8 +1374,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-11222-g6b75d88fa81b -c -mv linux-5.15-11222-g6b75d88fa81b linux-%{KVERREL} +%setup -q -n kernel-5.15-11645-gd2f38a3c6507 -c +mv linux-5.15-11645-gd2f38a3c6507 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2972,6 +2972,16 @@ fi # # %changelog +* Tue Nov 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211109gitd2f38a3c6507.9] +- arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann) +- drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy) + +* Tue Nov 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211109gitd2f38a3c6507.8] +- Filter updates for hid-playstation on Fedora (Justin M. Forbes) +- Revert "Force DWARF4 because crash does not support DWARF5 yet" (Lianbo Jiang) +- Enable CONFIG_VIRT_DRIVERS for ARK (Vitaly Kuznetsov) +- redhat/configs: Enable Nitro Enclaves on aarch64 (Vitaly Kuznetsov) + * Sat Nov 06 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211106gitfe91c4725aee.5] - Enable e1000 in rhel9 as unsupported (Ken Cox) [2002344] - Turn on COMMON_CLK_AXG_AUDIO for Fedora rhbz 2020481 (Justin M. Forbes) diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index 75041cf3e..ddee6ef39 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -5,6 +5,7 @@ arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 3 +- arch/arm64/kernel/acpi.c | 4 + + arch/arm64/kernel/cpufeature.c | 1 + arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + @@ -21,6 +22,7 @@ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 ++++++--- drivers/firmware/efi/secureboot.c | 38 +++ + drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +- drivers/hid/hid-rmi.c | 64 ----- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++ drivers/input/rmi4/rmi_driver.c | 124 +++++---- @@ -72,7 +74,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 74 files changed, 1381 insertions(+), 188 deletions(-) + 76 files changed, 1384 insertions(+), 189 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 0905d2cdb2d5..a433eaa1ab66 100644 @@ -128,7 +130,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index ccae14852814..2b45a326661c 100644 +index d83d72c26aaa..b4009aa40067 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -142,7 +144,7 @@ index ccae14852814..2b45a326661c 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1282,7 +1286,13 @@ define filechk_version.h +@@ -1245,7 +1249,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -210,6 +212,18 @@ index f3851724fe35..ef69eeab6f2a 100644 static bool param_acpi_force __initdata; static int __init parse_acpi(char *arg) +diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c +index ecbdff795f5e..646662407a07 100644 +--- a/arch/arm64/kernel/cpufeature.c ++++ b/arch/arm64/kernel/cpufeature.c +@@ -2864,6 +2864,7 @@ bool this_cpu_has_cap(unsigned int n) + + return false; + } ++EXPORT_SYMBOL_GPL(this_cpu_has_cap); + + /* + * This helper function is used in a narrow window when, diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index 3f8ee257f9aa..3ab92feb6241 100644 --- a/arch/s390/include/asm/ipl.h @@ -1037,6 +1051,23 @@ index 000000000000..de0a3714a5d4 + } + } +} +diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c +index 749db18dcfa2..d86e1ad4a972 100644 +--- a/drivers/gpu/drm/virtio/virtgpu_drv.c ++++ b/drivers/gpu/drm/virtio/virtgpu_drv.c +@@ -163,10 +163,11 @@ static __poll_t virtio_gpu_poll(struct file *filp, + struct drm_file *drm_file = filp->private_data; + struct virtio_gpu_fpriv *vfpriv = drm_file->driver_priv; + struct drm_device *dev = drm_file->minor->dev; ++ struct virtio_gpu_device *vgdev = dev->dev_private; + struct drm_pending_event *e = NULL; + __poll_t mask = 0; + +- if (!vfpriv->ring_idx_mask) ++ if (!vgdev->has_virgl_3d || !vfpriv || !vfpriv->ring_idx_mask) + return drm_poll(filp, wait); + + poll_wait(filp, &drm_file->event_wait, wait); diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 311eee599ce9..2460c6bd46f8 100644 --- a/drivers/hid/hid-rmi.c @@ -2260,10 +2291,10 @@ index f5844908a089..901d51012738 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index b4dbcc86b3f1..5950ed6035fc 100644 +index c8afbee5da4b..122c0b5473fe 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1474,6 +1474,10 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1475,6 +1475,10 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); @@ -2699,7 +2730,7 @@ index 50f96ea4452a..4f2f992de1aa 100644 IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; diff --git a/kernel/module.c b/kernel/module.c -index 5c26a76e800b..25c4108ac627 100644 +index 84a9141a5e15..d5aabc30ba8d 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -743,6 +743,7 @@ static struct module_attribute modinfo_##field = { \ @@ -1,3 +1,3 @@ -SHA512 (linux-5.15-11222-g6b75d88fa81b.tar.xz) = bf83c4d4de788035ae373271fdd870a0fb0f4ba8ba3d1695e5adc000c1ed9445724d0e39cbc145412a4cfc1986662d0d295c8c232e6df2df0f8b5311f1023d1d -SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211108git6b75d88fa81b.7.tar.bz2) = e1b546486c8b85e753b66d8d151d00637aabe9caba5c4eeb221880cd9af7c3757d1cee213fa638c519dd4ea7f564e731c164d09e1526b1e817acf7d047740f34 -SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211108git6b75d88fa81b.7.tar.bz2) = 44a2fa1d3c32d4b2464cdd9e76a68537be12be985b1357ef3ae69e5f0aff1fb1c609998331cf82ac7252b453f41841168e4d88955994d1e2a5b418efe4231156 +SHA512 (linux-5.15-11645-gd2f38a3c6507.tar.xz) = 32ccfee21d0b221037696e392623981511457258627e565faa084022d749069551b85406707782ea06d9308938316c6170d983f875b4e0876acb7a6ad6090967 +SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.tar.bz2) = 4702190598df5439774e01ad2071dff075d989a60e7356f3c85f1a5a4cb692a0ee43d728371c690eb4f2161fcb0ce1ff4b5f14fa3891d74de1f8293cb7f0ebb7 +SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.tar.bz2) = 8e06c53dd3b27a3980c9cbbfca86b12ddff0961c1534b56dc6bc292752dfa3dca455a5adbce56c559a4470563df868c62dec76d4ff06df474eef2392e22f8917 |