summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-05-13 21:25:16 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-05-13 21:25:16 +0200
commit437be5ae477df4db34ddac0503f5dc4d1bc51650 (patch)
tree6e21312d7775ef46151e3e8579292ef7fa7b1faa
parentf7084db8ee78101cb4ee094ae59e08498f18f6a5 (diff)
parent483a93c5de77fdc40a4aeefc5fac9fae4180a9e3 (diff)
downloadkernel-437be5ae477df4db34ddac0503f5dc4d1bc51650.tar.gz
kernel-437be5ae477df4db34ddac0503f5dc4d1bc51650.tar.xz
kernel-437be5ae477df4db34ddac0503f5dc4d1bc51650.zip
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog12
-rw-r--r--kernel-aarch64-debug-fedora.config7
-rw-r--r--kernel-aarch64-debug-rhel.config7
-rw-r--r--kernel-aarch64-fedora.config7
-rw-r--r--kernel-aarch64-rhel.config7
-rw-r--r--kernel-armv7hl-debug-fedora.config7
-rw-r--r--kernel-armv7hl-fedora.config7
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config7
-rw-r--r--kernel-armv7hl-lpae-fedora.config7
-rw-r--r--kernel-ppc64le-debug-fedora.config7
-rw-r--r--kernel-ppc64le-debug-rhel.config7
-rw-r--r--kernel-ppc64le-fedora.config7
-rw-r--r--kernel-ppc64le-rhel.config7
-rw-r--r--kernel-s390x-debug-fedora.config7
-rw-r--r--kernel-s390x-debug-rhel.config7
-rw-r--r--kernel-s390x-fedora.config7
-rw-r--r--kernel-s390x-rhel.config7
-rw-r--r--kernel-s390x-zfcpdump-rhel.config7
-rw-r--r--kernel-x86_64-debug-fedora.config7
-rw-r--r--kernel-x86_64-debug-rhel.config7
-rw-r--r--kernel-x86_64-fedora.config7
-rw-r--r--kernel-x86_64-rhel.config7
-rwxr-xr-xkernel.spec27
-rwxr-xr-xprocess_configs.sh2
-rw-r--r--sources6
26 files changed, 157 insertions, 39 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 51d34901a..72df93ba9 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 = 50
+RHEL_RELEASE = 51
#
# ZSTREAM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 82e445142..85086955a 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -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
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index fdf8da467..075d6421c 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -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
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 8c746009c..5bccf999f 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -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
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index d532ef0bd..d3fdf8f2b 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -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
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index e04b4c949..d5c51f303 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -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
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 6b76a24f5..a484a535d 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -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
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 363596922..fc14efb07 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -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
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index b90916587..c572e1df4 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -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
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index ae3724b44..bee97a8bd 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -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
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index ac5deacb8..dd1c62ba6 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -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
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 767763000..34f021521 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -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
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 65801f266..f4a41fe7f 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -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
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 01e66a849..c44d63656 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -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
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 5c20563f1..65238fd41 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -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
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index d01360e9c..607105381 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -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
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 3a1307c30..3e896f581 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -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
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 8733c54d3..ebbd625bb 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -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
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 97d739702..b79aa3af7 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -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
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 724a2e479..00774738a 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -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
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index db6b70296..c6f9d4d3a 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -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
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index b9ff2865f..8a20fc87c 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -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
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index aba72003b..5f2c8de4a 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -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
diff --git a/kernel.spec b/kernel.spec
index 26a96ace2..3e48b3749 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -131,13 +131,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.220511.feb9c5e19e913b5.50%{?buildid}%{?dist}
+%define specrelease 0.rc6.220513.f3f19f939c11925.51%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -656,6 +656,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
@@ -692,7 +696,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
@@ -1384,8 +1388,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} .
@@ -2354,7 +2358,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}
@@ -3031,12 +3035,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)
diff --git a/process_configs.sh b/process_configs.sh
index b6f48c9a9..987fb78c1 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -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}"
diff --git a/sources b/sources
index e6f37b142..fc8ea3086 100644
--- a/sources
+++ b/sources
@@ -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