kernel 6.2.156.2

5 files changed, 44 insertions, 13 deletions

diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog
index bf8c605..0fb0046 100644
--- a/SOURCES/Patchlist.changelog
+++ b/SOURCES/Patchlist.changelog
@@ -1,3 +1,6 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/031984ff6b9b3a71724ccaf58e6bd26cd1997a5f
+ 031984ff6b9b3a71724ccaf58e6bd26cd1997a5f xfs: verify buffer contents when we skip log replay
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/efa74f28ec858cb955be08faf1086f05c3f7510a
  efa74f28ec858cb955be08faf1086f05c3f7510a arm64: dts: rk3399-pinephone-pro: Add touchscreen support
 
diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config
index bb20995..54b1320 100644
--- a/SOURCES/kernel-x86_64-debug-fedora.config
+++ b/SOURCES/kernel-x86_64-debug-fedora.config
@@ -7897,7 +7897,7 @@ CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV2659=m
 CONFIG_VIDEO_OV2680=m
 CONFIG_VIDEO_OV2685=m
-CONFIG_VIDEO_OV2740=m
+# CONFIG_VIDEO_OV2740 is not set
 CONFIG_VIDEO_OV4689=m
 CONFIG_VIDEO_OV5640=m
 CONFIG_VIDEO_OV5645=m
diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config
index b366096..46d866f 100644
--- a/SOURCES/kernel-x86_64-fedora.config
+++ b/SOURCES/kernel-x86_64-fedora.config
@@ -7875,7 +7875,7 @@ CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV2659=m
 CONFIG_VIDEO_OV2680=m
 CONFIG_VIDEO_OV2685=m
-CONFIG_VIDEO_OV2740=m
+# CONFIG_VIDEO_OV2740 is not set
 CONFIG_VIDEO_OV4689=m
 CONFIG_VIDEO_OV5640=m
 CONFIG_VIDEO_OV5645=m
diff --git a/SOURCES/patch-6.2-redhat.patch b/SOURCES/patch-6.2-redhat.patch
index 95ab567..60ba7c3 100644
--- a/SOURCES/patch-6.2-redhat.patch
+++ b/SOURCES/patch-6.2-redhat.patch
@@ -26,6 +26,7 @@
  drivers/iommu/iommu.c                              |  22 +
  drivers/pci/quirks.c                               |  24 +
  drivers/usb/core/hub.c                             |   7 +
+ fs/xfs/xfs_buf_item_recover.c                      |  10 +
  include/linux/efi.h                                |  22 +-
  include/linux/lsm_hook_defs.h                      |   2 +
  include/linux/lsm_hooks.h                          |   6 +
@@ -38,7 +39,7 @@
  security/lockdown/Kconfig                          |  13 +
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 40 files changed, 1634 insertions(+), 177 deletions(-)
+ 41 files changed, 1644 insertions(+), 177 deletions(-)
 
 diff --git a/Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml b/Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml
 new file mode 100644
@@ -123,7 +124,7 @@ index 000000000000..1b2a1baa26f9
 +
 +...
 diff --git a/Makefile b/Makefile
-index 031d40ad0bd9..66edabb9f60d 100644
+index 9f535df81b03..3f92ef879b76 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1679,7 +1680,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 f8100067502f..e0823c45e2fa 100644
+index e6f2a0bc9f0b..537fc8197a21 100644
 --- a/drivers/iommu/iommu.c
 +++ b/drivers/iommu/iommu.c
 @@ -8,6 +8,7 @@
@@ -1690,7 +1691,7 @@ index f8100067502f..e0823c45e2fa 100644
  #include <linux/kernel.h>
  #include <linux/bits.h>
  #include <linux/bug.h>
-@@ -2813,6 +2814,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
+@@ -2818,6 +2819,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
  }
  EXPORT_SYMBOL_GPL(iommu_dev_disable_feature);
 
@@ -1719,10 +1720,10 @@ index f8100067502f..e0823c45e2fa 100644
   * Changes the default domain of an iommu group that has *only* one device
   *
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 494fa46f5767..27bc8dd45ad8 100644
+index 8d32a3834688..4957f0a42315 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -4296,6 +4296,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4309,6 +4309,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
  				quirk_bridge_cavm_thrx2_pcie_root);
 
@@ -1771,6 +1772,27 @@ index 97a0f8faea6e..d837548d2024 100644
  	/* Lock the device, then check to see if we were
  	 * disconnected while waiting for the lock to succeed. */
  	usb_lock_device(hdev);
+diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c
+index ffa94102094d..43167f543afc 100644
+--- a/fs/xfs/xfs_buf_item_recover.c
++++ b/fs/xfs/xfs_buf_item_recover.c
+@@ -943,6 +943,16 @@ xlog_recover_buf_commit_pass2(
+ 	if (lsn && lsn != -1 && XFS_LSN_CMP(lsn, current_lsn) >= 0) {
+ 		trace_xfs_log_recover_buf_skip(log, buf_f);
+ 		xlog_recover_validate_buf_type(mp, bp, buf_f, NULLCOMMITLSN);
++
++		/*
++		 * We're skipping replay of this buffer log item due to the log
++		 * item LSN being behind the ondisk buffer.  Verify the buffer
++		 * contents since we aren't going to run the write verifier.
++		 */
++		if (bp->b_ops) {
++			bp->b_ops->verify_read(bp);
++			error = bp->b_error;
++		}
+ 		goto out_release;
+ 	}
+
 diff --git a/include/linux/efi.h b/include/linux/efi.h
 index ac22f7ca195a..e680835ad387 100644
 --- a/include/linux/efi.h
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index dc3a857..b29cdfb 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -148,17 +148,17 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 %define buildid .fsync
-%define specversion 6.2.14
+%define specversion 6.2.15
 %define patchversion 6.2
 %define pkgrelease 300
 %define kversion 6
-%define tarfile_release 6.2.14
+%define tarfile_release 6.2.15
 # This is needed to do merge window version magic
 %define patchlevel 2
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 301%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.2.14
+%define kabiversion 6.2.15
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3388,8 +3388,14 @@ fi
 #
 #
 %changelog
-* Wed May 03 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.2.14-301.fsync
-- kernel-fsync v6.2.14
+* Fri May 12 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.2.15-301.fsync
+- kernel-fsync v6.2.15
+
+* Thu May 11 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.2.15-0]
+- redhat: configs: generic: x86: Disable CONFIG_VIDEO_OV2740 for x86 platform (Kate Hsuan)
+- Add Bugs to be fixed in 6.2.15 (Justin M. Forbes)
+- xfs: verify buffer contents when we skip log replay (Darrick J. Wong)
+- Linux v6.2.15
 
 * Sun Apr 30 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.2.14-0]
 - Linux v6.2.14