kernel-5.18.0-0.rc6.20220513gitf3f19f939c11925.51

* Fri May 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.f3f19f939c11925.50]
- Add CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes)
- efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones)
- efi: libstub: ensure allocated memory to be executable (Baskov Evgeniy)
- efi: libstub: declare DXE services table (Baskov Evgeniy)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-05-13 07:09:44 -05:00
parent 88a5582729
commit 483a93c5de
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
26 changed files with 157 additions and 39 deletions

View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 50
RHEL_RELEASE = 51
#
# ZSTREAM

View File

@ -1,11 +1,11 @@
"https://gitlab.com/cki-project/kernel-ark/-/commit"/d4fe884ae95754959426fb010f9ea0552bc73292
d4fe884ae95754959426fb010f9ea0552bc73292 efi: x86: Set the NX-compatibility flag in the PE header
"https://gitlab.com/cki-project/kernel-ark/-/commit"/d7f7a82ee0befeeedc638fdbdd933c6593658c4a
d7f7a82ee0befeeedc638fdbdd933c6593658c4a efi: x86: Set the NX-compatibility flag in the PE header
"https://gitlab.com/cki-project/kernel-ark/-/commit"/280b03ff74776724f36fffd5af4b2afa693e943c
280b03ff74776724f36fffd5af4b2afa693e943c efi: libstub: ensure allocated memory to be executable
"https://gitlab.com/cki-project/kernel-ark/-/commit"/8daa846d10413fc86310304cb8c1a11ccb8591e2
8daa846d10413fc86310304cb8c1a11ccb8591e2 efi: libstub: ensure allocated memory to be executable
"https://gitlab.com/cki-project/kernel-ark/-/commit"/bca9c78c03b6339830fff93b887dfc462ba8e224
bca9c78c03b6339830fff93b887dfc462ba8e224 efi: libstub: declare DXE services table
"https://gitlab.com/cki-project/kernel-ark/-/commit"/5501990e41ef21fa8fb34863d00798848d1cdd02
5501990e41ef21fa8fb34863d00798848d1cdd02 efi: libstub: declare DXE services table
"https://gitlab.com/cki-project/kernel-ark/-/commit"/a0c122c4fb17f350396cb664d2fc184df9872279
a0c122c4fb17f350396cb664d2fc184df9872279 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed

View File

@ -1495,7 +1495,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1118,7 +1118,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
# CONFIG_DA280 is not set
# CONFIG_DA311 is not set
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1495,7 +1495,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1118,7 +1118,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
# CONFIG_DA280 is not set
# CONFIG_DA311 is not set
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1486,7 +1486,12 @@ CONFIG_DA311=m
CONFIG_DA9052_WATCHDOG=m
CONFIG_DA9055_WATCHDOG=m
CONFIG_DA9063_WATCHDOG=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1486,7 +1486,12 @@ CONFIG_DA311=m
CONFIG_DA9052_WATCHDOG=m
CONFIG_DA9055_WATCHDOG=m
CONFIG_DA9063_WATCHDOG=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1454,7 +1454,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAVINCI_WATCHDOG=m
CONFIG_DAX=y

View File

@ -1454,7 +1454,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAVINCI_WATCHDOG=m
CONFIG_DAX=y

View File

@ -1134,7 +1134,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -966,7 +966,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
# CONFIG_DA280 is not set
# CONFIG_DA311 is not set
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1133,7 +1133,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -966,7 +966,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
# CONFIG_DA280 is not set
# CONFIG_DA311 is not set
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1139,7 +1139,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DASD_DIAG=m
CONFIG_DASD_ECKD=m
CONFIG_DASD_EER=y

View File

@ -967,7 +967,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
# CONFIG_DA280 is not set
# CONFIG_DA311 is not set
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DASD_DIAG=m
CONFIG_DASD_ECKD=m
CONFIG_DASD_EER=y

View File

@ -1138,7 +1138,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DASD_DIAG=m
CONFIG_DASD_ECKD=m
CONFIG_DASD_EER=y

View File

@ -967,7 +967,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
# CONFIG_DA280 is not set
# CONFIG_DA311 is not set
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DASD_DIAG=m
CONFIG_DASD_ECKD=m
CONFIG_DASD_EER=y

View File

@ -972,7 +972,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
# CONFIG_DA280 is not set
# CONFIG_DA311 is not set
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DASD_DIAG=m
CONFIG_DASD_ECKD=m
CONFIG_DASD_EER=y

View File

@ -1234,7 +1234,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1026,7 +1026,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
# CONFIG_DA280 is not set
# CONFIG_DA311 is not set
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCA=m

View File

@ -1233,7 +1233,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
CONFIG_DA280=m
CONFIG_DA311=m
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y

View File

@ -1026,7 +1026,12 @@ CONFIG_CXL_PCI=y
CONFIG_CXL_PMEM=m
# CONFIG_DA280 is not set
# CONFIG_DA311 is not set
# CONFIG_DAMON is not set
CONFIG_DAMON_DBGFS=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_RECLAIM=y
CONFIG_DAMON_SYSFS=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON=y
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCA=m

View File

@ -129,13 +129,13 @@ Summary: The Linux kernel
%define specversion 5.18.0
%define patchversion 5.18
%define pkgrelease 0.rc6.20220511gitfeb9c5e19e913b5.50
%define pkgrelease 0.rc6.20220513gitf3f19f939c11925.51
# This is needed to do merge window version magic
%define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc6.20220511gitfeb9c5e19e913b5.50%{?buildid}%{?dist}
%define specrelease 0.rc6.20220513gitf3f19f939c11925.51%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@ -654,6 +654,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
# ELN uses Fedora signing process, so exclude
%if 0%{?rhel}%{?centos} && !0%{?eln}
BuildRequires: system-sb-certs
%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@ -690,7 +694,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.18-rc6-9-gfeb9c5e19e913b5.tar.xz
Source0: linux-5.18-rc6-85-gf3f19f939c11925.tar.xz
Source1: Makefile.rhelver
@ -1382,8 +1386,8 @@ ApplyOptionalPatch()
fi
}
%setup -q -n kernel-5.18-rc6-9-gfeb9c5e19e913b5 -c
mv linux-5.18-rc6-9-gfeb9c5e19e913b5 linux-%{KVERREL}
%setup -q -n kernel-5.18-rc6-85-gf3f19f939c11925 -c
mv linux-5.18-rc6-85-gf3f19f939c11925 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@ -2348,7 +2352,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} xz; \
find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@ -3025,12 +3029,21 @@ fi
#
#
%changelog
* Wed May 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.feb9c5e19e913b5.49]
* Fri May 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.f3f19f939c11925.50]
- Add CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes)
- efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones)
- efi: libstub: ensure allocated memory to be executable (Baskov Evgeniy)
- efi: libstub: declare DXE services table (Baskov Evgeniy)
* Fri May 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.f3f19f939c11925.49]
- redhat/configs: Fix rm warning on error (Prarit Bhargava)
- Fix nightly merge CI (Don Zickus)
- redhat/kernel.spec.template: fix standalone tools build (Jan Stancek)
- Add system-sb-certs for RHEL-9 (Don Zickus)
- Fix dist-buildcheck-reqs (Don Zickus)
- move DAMON configs to correct directory (Chris von Recklinghausen)
- redhat: indicate HEAD state in tarball/rpm name (Jarod Wilson)
* Wed May 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.feb9c5e19e913b5.48]
- Fedora 5.18 config set part 1 (Justin M. Forbes)

View File

@ -262,7 +262,7 @@ function process_config()
rm .newoptions"${count}"
RETURNCODE=1
fi
rm .newoptions"${count}"
rm -f .newoptions"${count}"
grep -E 'config.*warning' .listnewconfig"${count}" > .warnings"${count}"
if test -n "$CHECKWARNINGS" && test -s .warnings"${count}"

View File

@ -1,3 +1,3 @@
SHA512 (linux-5.18-rc6-9-gfeb9c5e19e913b5.tar.xz) = 906033535fcd9b5ca609b9745c3b02d5bdc8048354112c071a6ee3628668533db91b68e610b51db18c1920884be56c30d4caeb5327e0bf814506ef6b96636588
SHA512 (kernel-abi-stablelists-5.18.0-0.rc6.20220511gitfeb9c5e19e913b5.50.tar.bz2) = 671205d41c18f82a2446c250fe996787403bfe06695f25eb33768ef890d15db0a27205843522a5ea78f6d2a02959210f3223507384c5b187e59b8bfda2b29b11
SHA512 (kernel-kabi-dw-5.18.0-0.rc6.20220511gitfeb9c5e19e913b5.50.tar.bz2) = 10ea66c5a23b19dd45e9c75d9df11b4e280276cd5ac1699b2dd0873f438a83675795d9fe7f7b6bcbe613c58d90513fb3685e714425a29ca80b29c0cacbfdc22f
SHA512 (linux-5.18-rc6-85-gf3f19f939c11925.tar.xz) = 5b7fca62feb2df28a9abd36aa9b9ce9ea6167c6167211c2d6799509cbbd444c4fe248738270733fd8b6db9f450a2e418f720537c8bbc3ca4123f684b8d3bec17
SHA512 (kernel-abi-stablelists-5.18.0-0.rc6.20220513gitf3f19f939c11925.51.tar.bz2) = df122025ae6cfcf4b91937cb03cc9e20a58153ccdf17c74166fc5a15e803da5300fba2b5ece9235043e3965028dae5346932a41a858672c674407859bc2de8b1
SHA512 (kernel-kabi-dw-5.18.0-0.rc6.20220513gitf3f19f939c11925.51.tar.bz2) = c0ae85291fb1fe5b38a657ee4cfdf0f8ad60f39fd56c82a78a47165b944e69226d042e95989e04a6b001637ad9dbb528a424884a24426119a61d116e93f133a9