summaryrefslogtreecommitdiff
path: root/SOURCES/patch-6.3-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'SOURCES/patch-6.3-redhat.patch')
-rw-r--r--SOURCES/patch-6.3-redhat.patch21
1 files changed, 17 insertions, 4 deletions
diff --git a/SOURCES/patch-6.3-redhat.patch b/SOURCES/patch-6.3-redhat.patch
index e1d8507..41359bc 100644
--- a/SOURCES/patch-6.3-redhat.patch
+++ b/SOURCES/patch-6.3-redhat.patch
@@ -23,6 +23,7 @@
drivers/nvme/host/nvme.h | 4 +
drivers/pci/quirks.c | 24 ++++
drivers/usb/core/hub.c | 7 ++
+ fs/xfs/libxfs/xfs_bmap.c | 1 -
fs/xfs/xfs_buf_item_recover.c | 10 ++
include/linux/efi.h | 22 ++--
include/linux/lsm_hook_defs.h | 2 +
@@ -36,10 +37,10 @@
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
sound/pci/hda/patch_realtek.c | 2 +
- 38 files changed, 502 insertions(+), 186 deletions(-)
+ 39 files changed, 502 insertions(+), 187 deletions(-)
diff --git a/Makefile b/Makefile
-index a3108cf700a0..e69155920a8f 100644
+index 3c5b60669018..154ee11110d4 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1131,6 +1132,18 @@ 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/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
+index 34de6e6898c4..3ce43068daa1 100644
+--- a/fs/xfs/libxfs/xfs_bmap.c
++++ b/fs/xfs/libxfs/xfs_bmap.c
+@@ -3505,7 +3505,6 @@ xfs_bmap_btalloc_at_eof(
+ * original non-aligned state so the caller can proceed on allocation
+ * failure as if this function was never called.
+ */
+- args->fsbno = ap->blkno;
+ args->alignment = 1;
+ return 0;
+ }
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
@@ -1399,10 +1412,10 @@ index cf6cc576736f..3653a4f35265 100644
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 172ffc2c332b..645d23d63b71 100644
+index c75760717736..62366750c261 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
-@@ -9697,6 +9697,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -9706,6 +9706,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2),