summaryrefslogtreecommitdiff
path: root/SOURCES/patch-6.2-redhat.patch
diff options
context:
space:
mode:
authorJan200101 <sentrycraft123@gmail.com>2023-05-12 22:43:17 +0200
committerJan200101 <sentrycraft123@gmail.com>2023-05-12 22:43:17 +0200
commit9ed420883ade242a0ab4aead5ff7fb6cb7184a6d (patch)
tree953e56b21d94b73fee236a2df8467b6c3c9e848b /SOURCES/patch-6.2-redhat.patch
parentbb1ad06e757eabf46f831fd11d1e95541555d8da (diff)
downloadkernel-fsync-9ed420883ade242a0ab4aead5ff7fb6cb7184a6d.tar.gz
kernel-fsync-9ed420883ade242a0ab4aead5ff7fb6cb7184a6d.zip
kernel 6.2.156.2
Diffstat (limited to 'SOURCES/patch-6.2-redhat.patch')
-rw-r--r--SOURCES/patch-6.2-redhat.patch34
1 files changed, 28 insertions, 6 deletions
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