kernel-5.16-0.rc0.20211111gitdebe436e77c7.11

* Thu Nov 11 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211111gitdebe436e77c7.11] - 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>
2021-11-11 10:00:54 -06:00 · 2021-11-11 10:00:54 -06:00 · f0005b3337
commit f0005b3337
parent cd5be03fde
19 changed files with 56 additions and 25 deletions
--- 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 = 10
+RHEL_RELEASE = 11

 #
 # Early y+1 numbering
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,8 +1,8 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/22d78162a1ebd87197d6395e7b702033e6cd2905
- 22d78162a1ebd87197d6395e7b702033e6cd2905 arm64: cpufeature: Export this_cpu_has_cap helper
+https://gitlab.com/cki-project/kernel-ark/-/commit/08976b7add73a184cbe339aadd9bb83b0c0d6800
+ 08976b7add73a184cbe339aadd9bb83b0c0d6800 arm64: cpufeature: Export this_cpu_has_cap helper

-https://gitlab.com/cki-project/kernel-ark/-/commit/b3f61c9e2180aebee495c2f5e1389a8a1493bb0b
- b3f61c9e2180aebee495c2f5e1389a8a1493bb0b drm/virtio: Fix NULL dereference error in virtio_gpu_poll
+https://gitlab.com/cki-project/kernel-ark/-/commit/9263342d48cdaad8a46fa002b7676e9571ce70a9
+ 9263342d48cdaad8a46fa002b7676e9571ce70a9 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
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -2938,6 +2938,7 @@ CONFIG_IMX7D_ADC=m
 CONFIG_IMX8MM_THERMAL=m
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
@ -3903,6 +3904,7 @@ CONFIG_MESON_GXL_PHY=m
 CONFIG_MESON_GX_PM_DOMAINS=y
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESON_SARADC=m
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -2922,6 +2922,7 @@ CONFIG_IMX7D_ADC=m
 CONFIG_IMX8MM_THERMAL=m
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
@ -3879,6 +3880,7 @@ CONFIG_MESON_GXL_PHY=m
 CONFIG_MESON_GX_PM_DOMAINS=y
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESON_SARADC=m
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -2962,6 +2962,7 @@ CONFIG_IMX7D_ADC=m
 CONFIG_IMX8MM_THERMAL=m
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 CONFIG_IMX_IPUV3_CORE=m
@ -3960,6 +3961,7 @@ CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESON_MX_EFUSE=m
 CONFIG_MESON_MX_SOCINFO=y
 CONFIG_MESON_SARADC=m
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -2947,6 +2947,7 @@ CONFIG_IMX7D_ADC=m
 CONFIG_IMX8MM_THERMAL=m
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 CONFIG_IMX_IPUV3_CORE=m
@ -3937,6 +3938,7 @@ CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESON_MX_EFUSE=m
 CONFIG_MESON_MX_SOCINFO=y
 CONFIG_MESON_SARADC=m
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -2905,6 +2905,7 @@ CONFIG_IMX7D_ADC=m
 CONFIG_IMX8MM_THERMAL=m
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
@ -3877,6 +3878,7 @@ CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESON_MX_EFUSE=m
 CONFIG_MESON_MX_SOCINFO=y
 CONFIG_MESON_SARADC=m
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -2890,6 +2890,7 @@ CONFIG_IMX7D_ADC=m
 CONFIG_IMX8MM_THERMAL=m
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
@ -3854,6 +3855,7 @@ CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESON_MX_EFUSE=m
 CONFIG_MESON_MX_SOCINFO=y
 CONFIG_MESON_SARADC=m
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@ -2574,6 +2574,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@ -3540,6 +3541,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_MERAKI_MX100 is not set
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@ -2557,6 +2557,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@ -3517,6 +3518,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_MERAKI_MX100 is not set
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@ -2415,6 +2415,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@ -3308,6 +3309,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_MERAKI_MX100 is not set
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@ -2398,6 +2398,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@ -3284,6 +3285,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_MERAKI_MX100 is not set
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -2395,6 +2395,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@ -3291,6 +3292,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_MERAKI_MX100 is not set
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -2378,6 +2378,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@ -3267,6 +3268,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_MERAKI_MX100 is not set
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -2619,6 +2619,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@ -3592,6 +3593,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_MERAKI_MX100 is not set
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -2602,6 +2602,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX_DSP_REMOTEPROC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@ -3569,6 +3570,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_MERAKI_MX100 is not set
+# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
--- 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.20211110gitcb690f5238d7.10
+%global distro_build 0.rc0.20211111gitdebe436e77c7.11

 %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.20211110gitcb690f5238d7.10
+%define pkgrelease 0.rc0.20211111gitdebe436e77c7.11

 # This is needed to do merge window version magic
 %define patchlevel 16

 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20211110gitcb690f5238d7.10%{?buildid}%{?dist}
+%define specrelease 0.rc0.20211111gitdebe436e77c7.11%{?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-11863-gcb690f5238d7.tar.xz
+Source0: linux-5.15-12267-gdebe436e77c7.tar.xz

 Source1: Makefile.rhelver

@ -1374,8 +1374,8 @@ ApplyOptionalPatch()
  fi
 }

-%setup -q -n kernel-5.15-11863-gcb690f5238d7 -c
-mv linux-5.15-11863-gcb690f5238d7 linux-%{KVERREL}
+%setup -q -n kernel-5.15-12267-gdebe436e77c7 -c
+mv linux-5.15-12267-gdebe436e77c7 linux-%{KVERREL}

 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@ -2184,7 +2184,7 @@ InitBuildVars
 %global perf_build_extra_opts CORESIGHT=1
 %endif
 %global perf_make \
-  %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
+  %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
 %if %{with_perf}
 # perf
 # make sure check-headers.sh is executable
@ -2972,10 +2972,13 @@ fi
 #
 #
 %changelog
-* Wed Nov 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211110gitcb690f5238d7.10]
+* Thu Nov 11 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211111gitdebe436e77c7.11]
 - arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann)
 - drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy)

+* Thu Nov 11 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211111gitdebe436e77c7.10]
+- Add rebase notes to check for PCI patches (Justin M. Forbes)
+
 * Wed Nov 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211110gitcb690f5238d7.9]
 - redhat: configs: move CONFIG_ACCESSIBILITY from fedora to common (John W. Linville)

--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@ -77,10 +77,10 @@
 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
+index 9725c546a0d4..4d440bdcf5b9 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -5922,6 +5922,15 @@
+@@ -5936,6 +5936,15 @@
 	unknown_nmi_panic
 			[X86] Cause panic on unknown NMI.

@ -213,10 +213,10 @@ index f3851724fe35..ef69eeab6f2a 100644

 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
+index 7de96196ae14..6f3e677d88f1 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)
+@@ -2868,6 +2868,7 @@ bool this_cpu_has_cap(unsigned int n)

 	return false;
 }
@ -558,10 +558,10 @@ index c68e694fca26..146cba5ae5bc 100644
 	return ctx.rc;
 }
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index dce2c291b982..e047edc644e8 100644
+index a50f1967c73d..faeecb8bc471 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -1721,6 +1721,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+@@ -1725,6 +1725,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
 	if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids))
 		return false;

@ -2079,10 +2079,10 @@ index 86658a81d284..5647f4756e97 100644
 	 * disconnected while waiting for the lock to succeed. */
 	usb_lock_device(hdev);
 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index a320c54202d9..bd1e167436f4 100644
+index 4e33b5eca694..b480ca4934de 100644
 --- a/fs/ext4/super.c
 +++ b/fs/ext4/super.c
-@@ -4305,6 +4305,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
+@@ -4304,6 +4304,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 		set_bit(EXT4_FLAGS_BDEV_IS_DAX, &sbi->s_ext4_flags);

 	if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) {
@ -2090,7 +2090,7 @@ index a320c54202d9..bd1e167436f4 100644
 		if (ext4_has_feature_inline_data(sb)) {
 			ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem"
 					" that may contain inline data");
-@@ -4315,6 +4316,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
+@@ -4314,6 +4315,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 				"DAX unsupported by block device.");
 			goto failed_mount;
 		}
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.15-11863-gcb690f5238d7.tar.xz) = 6c14780cc8161ff66c21f621572d7a6ebfc72b6c95c7fad9f04ee3809b270e10849009cc8bc236bff22bc29417df5210f3f66076743cbf2646a0253126f58a26
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211110gitcb690f5238d7.10.tar.bz2) = e9ff23edb5c3b48e02d69c9313f1f6904c4262bcaf031f664e3ff13d11087158013d24c3dba3f71eaa0f707ff9a2cf59dbacb60ee1eba6c6ffcedd514f7d9731
-SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211110gitcb690f5238d7.10.tar.bz2) = 4629798e31ddfb6f2077a5d7ea0ec0b85609be5f760e48e26f4db7b7da1fade7e7825b124eab2c8dbe58dedbdf6b54601580937933a26213f067bb60240f81c4
+SHA512 (linux-5.15-12267-gdebe436e77c7.tar.xz) = aab85f56390077bf1af6c2c67213e0e2e778206844ecb2b73b6c60add240a058573e7157331bfc5ce76dc4a092f287582f70ccb65a1d1a3612b078ef8653f4b6
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211111gitdebe436e77c7.11.tar.bz2) = 94017a06d8fa9d90e5bf4cd5236614a3042318a392b793fed7f39c34ca0e5292305c3c543044dd017c512aea75bb8c1e75cd7a7d58d042ada65850324d3f3603
+SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211111gitdebe436e77c7.11.tar.bz2) = 3cb0391fd29ae297344c36fd9e1c5030d328a762391c5ed4c5091d5087b406bfbc044ba1d7073b94e81ff4fd653158e160052470b83a5638bf4d36fed89c7420