diff options
| -rw-r--r-- | SOURCES/Makefile.rhelver | 2 | ||||
| -rw-r--r-- | SOURCES/patch-6.3-redhat.patch | 19 | ||||
| -rw-r--r-- | SPECS/kernel.spec | 20 |
3 files changed, 16 insertions, 25 deletions
diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 498fb71..d069eeb 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 1 +RHEL_RELEASE = 0 # # RHEL_REBASE_NUM diff --git a/SOURCES/patch-6.3-redhat.patch b/SOURCES/patch-6.3-redhat.patch index 41359bc..bf80584 100644 --- a/SOURCES/patch-6.3-redhat.patch +++ b/SOURCES/patch-6.3-redhat.patch @@ -23,7 +23,6 @@ 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 + @@ -37,10 +36,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + sound/pci/hda/patch_realtek.c | 2 + - 39 files changed, 502 insertions(+), 187 deletions(-) + 38 files changed, 502 insertions(+), 186 deletions(-) diff --git a/Makefile b/Makefile -index 3c5b60669018..154ee11110d4 100644 +index d710ff6a3d56..fafd28dd7b62 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1132,18 +1131,6 @@ 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 @@ -1412,7 +1399,7 @@ 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 c75760717736..62366750c261 100644 +index 379f216158ab..5711a9365a91 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9706,6 +9706,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index f878c61..131d39a 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -142,18 +142,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 %define buildid .fsync -%define specrpmversion 6.3.4 -%define specversion 6.3.4 +%define specrpmversion 6.3.5 +%define specversion 6.3.5 %define patchversion 6.3 -%define pkgrelease 201 +%define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.3.4 +%define tarfile_release 6.3.5 # This is needed to do merge window version magic %define patchlevel 3 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 202%{?buildid}%{?dist} +%define specrelease 201%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.3.4 +%define kabiversion 6.3.5 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3448,8 +3448,12 @@ fi # # %changelog -* Sun Jun 04 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.3.4-202.fsync -- kernel-fsync v6.3.4 +* Sun Jun 04 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.3.5-201.fsync +- kernel-fsync v6.3.5 + +* Tue May 30 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.3.5-0] +- Drop rhelver for 6.3.5 (Justin M. Forbes) +- Linux v6.3.5 * Sat May 27 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.3.4-1] - Bump rhelver for build with xfs fix (Justin M. Forbes) |