diff --git a/Makefile.rhelver b/Makefile.rhelver index e9612fa4c..81beab618 100644 --- 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 = 12 +RHEL_RELEASE = 13 # # ZSTREAM diff --git a/kernel.spec b/kernel.spec index 835f5090a..ed093259c 100755 --- a/kernel.spec +++ b/kernel.spec @@ -141,13 +141,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.3.0 %define patchversion 6.3 -%define pkgrelease 0.rc0.20230302gitee3f96b16468.12 +%define pkgrelease 0.rc0.20230303git2eb29d59ddf0.13 %define kversion 6 -%define tarfile_release 6.2-13115-gee3f96b16468 +%define tarfile_release 6.2-13277-g2eb29d59ddf0 # This is needed to do merge window version magic %define patchlevel 3 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20230302gitee3f96b16468.12%{?buildid}%{?dist} +%define specrelease 0.rc0.20230303git2eb29d59ddf0.13%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.3.0 @@ -726,7 +726,11 @@ BuildRequires: dracut BuildRequires: binutils # For the initrd BuildRequires: lvm2 +%if 0%{?fedora} > 37 || 0%{?rhel} > 9 +# The UKI code was introduced in Fedora 38 and is not needed by earlier +# versions. This wrapper can be removed for fedora in Fedora 41. BuildRequires: systemd-boot-unsigned +%endif # For systemd-stub and systemd-pcrphase BuildRequires: systemd-udev >= 252-1 # For TPM operations in UKI initramfs @@ -3352,10 +3356,14 @@ fi # # %changelog -* Thu Mar 02 2023 Fedora Kernel Team [6.3.0-0.rc0.ee3f96b16468.12] +* Fri Mar 03 2023 Fedora Kernel Team [6.3.0-0.rc0.2eb29d59ddf0.13] - Add rtla-hwnoise files (Justin M. Forbes) +- redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency for RHEL (Prarit Bhargava) - fix tools build after vm to mm rename (Justin M. Forbes) +* Fri Mar 03 2023 Fedora Kernel Team [6.3.0-0.rc0.2eb29d59ddf0.12] +- Linux v6.3.0-0.rc0.2eb29d59ddf0 + * Thu Mar 02 2023 Fedora Kernel Team [6.3.0-0.rc0.ee3f96b16468.11] - redhat: adapt to upstream Makefile change (Clark Williams) - Linux v6.3.0-0.rc0.ee3f96b16468 diff --git a/patch-6.3-redhat.patch b/patch-6.3-redhat.patch index 2edc0d7e3..6dce581e2 100644 --- a/patch-6.3-redhat.patch +++ b/patch-6.3-redhat.patch @@ -165,7 +165,7 @@ index e24a9820e12f..c39629f18c95 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 27b2592698b0..5875d952ed53 100644 +index 1023e896d46b..55822162d9ee 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1238,7 +1238,7 @@ endchoice @@ -186,7 +186,7 @@ index 27b2592698b0..5875d952ed53 100644 default "12" if ARM64_16K_PAGES range 11 16 if ARM64_4K_PAGES diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c -index 378453faa87e..3eddf2d9ded9 100644 +index dba8fcec7f33..e4e33ecfefa9 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -42,7 +42,11 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ diff --git a/sources b/sources index 79d2581bf..6798d847d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-13115-gee3f96b16468.tar.xz) = 0447b5e3859be379737ccff426732fe7bdb3336202c569821a0a8d8abc35af7257c9bdb966863939d28865407b1b2a5a03757d326a1e64842698f2ab99858199 -SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 6a67ea9adc8c7b6388e79a71c0dbd05747d51c0d277f9bbdd853e015f5692bce13001336649acf068a5022ec5e676f209157e95c1ac7d245093f12721f9d0bc0 -SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 3abdf0af54c4bf5e7a42dd488db8388d87d1f04c323e27ef9beeba54a314de19187a85e27f6976f3039d715846a27438e60c026f2a455d8a5437c767bd43c704 +SHA512 (linux-6.2-13277-g2eb29d59ddf0.tar.xz) = 0952e4905c37240dc05c68e7fe7d19d0d58aed4fdfa74ac1fceae3266e33bd6e98b67afcbcab2bb3232525fce2b4502ba45a5e0bf8d7db4e6a7e535e107d8cec +SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 83818541afa162df9b5310334ae4225bd8be76fe0ad6098270d2563fa1a0bb5be41b420d1df6eaaea1bc37f8e736bf0a27d255f1b283c81e481f9f8772f6cfab +SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 01239a6d9e9ed9d5e85eacad4383d6398510a194b18fc1b4795a890b8762bb77330dae7db0b623aa98372ead4f2b9f7eb5051b64511368b776ef60a3b08625ac