rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-5.18.0-0.rc4.46cf2c613f4b10e.34

Browse Source 
* Wed Apr 27 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc4.46cf2c613f4b10e.34]
- ARK: Remove code marking drivers as tech preview (Peter Georg)
- ARK: Remove code marking devices deprecated (Peter Georg)
- ARK: Remove code marking devices unmaintained (Peter Georg)
- rh_message: Fix function name (Peter Georg) [2019377]
Resolves: rhbz#2019377

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-04-29 07:42:43 -05:00
parent 157be69bed
commit eecbda4b1f
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 36 RHEL_RELEASE = 37
# #
# Early y+1 numbering # Early y+1 numbering

12
kernel.spec
View File

@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 0 %define debugbuildsenabled 0
%global distro_build 0.rc4.20220428git8f4dd16603ce834.36 %global distro_build 0.rc4.20220429git38d741cb70b3074.37
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -131,13 +131,13 @@ Summary: The Linux kernel
%define rpmversion 5.18.0 %define rpmversion 5.18.0
%define patchversion 5.18 %define patchversion 5.18
%define pkgrelease 0.rc4.20220428git8f4dd16603ce834.36 %define pkgrelease 0.rc4.20220429git38d741cb70b3074.37
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 18 %define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc4.20220428git8f4dd16603ce834.36%{?buildid}%{?dist} %define specrelease 0.rc4.20220429git38d741cb70b3074.37%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -692,7 +692,7 @@ BuildRequires: lld
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.18-rc4-64-g8f4dd16603ce834.tar.xz Source0: linux-5.18-rc4-192-g38d741cb70b3074.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1384,8 +1384,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.18-rc4-64-g8f4dd16603ce834 -c %setup -q -n kernel-5.18-rc4-192-g38d741cb70b3074 -c
mv linux-5.18-rc4-64-g8f4dd16603ce834 linux-%{KVERREL} mv linux-5.18-rc4-192-g38d741cb70b3074 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .

16
patch-5.18-redhat.patch
View File

@ -68,8 +68,7 @@
security/lockdown/Kconfig | 13 + security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 + security/lockdown/lockdown.c | 1 +
security/security.c | 6 + security/security.c | 6 +
tools/power/x86/intel-speed-select/Makefile | 2 +- 70 files changed, 1723 insertions(+), 188 deletions(-)
71 files changed, 1724 insertions(+), 189 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 3f1cc5e317ed..fbc0870dd787 100644 index 3f1cc5e317ed..fbc0870dd787 100644
@ -3305,16 +3304,3 @@ index b7cf5cbfdc67..3cde9062fcf6 100644
#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type) int security_perf_event_open(struct perf_event_attr *attr, int type)
{ {
diff --git a/tools/power/x86/intel-speed-select/Makefile b/tools/power/x86/intel-speed-select/Makefile
index 846f785e278d..7221f2f55e8b 100644
--- a/tools/power/x86/intel-speed-select/Makefile
+++ b/tools/power/x86/intel-speed-select/Makefile
@@ -42,7 +42,7 @@ ISST_IN := $(OUTPUT)intel-speed-select-in.o
$(ISST_IN): prepare FORCE
$(Q)$(MAKE) $(build)=intel-speed-select
$(OUTPUT)intel-speed-select: $(ISST_IN)
- $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
+ $(QUIET_LINK)$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
clean:
rm -f $(ALL_PROGRAMS)

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.18-rc4-64-g8f4dd16603ce834.tar.xz) = e8b430a4bef0d75524b3f054f53d4859d65ff65d10849b3f98ea2a1cd4c76c8fd28800e0218963afb9243bf9a6264a686bea7b8e8df70e15284e266926eb32b2 SHA512 (linux-5.18-rc4-192-g38d741cb70b3074.tar.xz) = b2883cda815ddc68cb9410ff83036038c958e6d4907a1538c19469393702f9c1835475da9a31af81f32dda0cf58feda4703d8e3e590cebdac124b3f479835a13
SHA512 (kernel-abi-stablelists-5.18.0-0.rc4.20220428git8f4dd16603ce834.36.tar.bz2) = 948287c75068db716fa5982120c22fdaaffb2c28228ce3ac12e60663bd802a7d38fee92c07cca8447e28d4372f2d247d99e9d913c00dbbd918f84c50e4a846d4 SHA512 (kernel-abi-stablelists-5.18.0-0.rc4.20220429git38d741cb70b3074.37.tar.bz2) = 7e60a321e1a042d2e1490b2cb5263dfdae02856fe376b246bba3a9bc8e40e4faa0c7b8f77ea4f3c6a9158800f158f31269b627eeecb793006fa49bb4d0d14a05
SHA512 (kernel-kabi-dw-5.18.0-0.rc4.20220428git8f4dd16603ce834.36.tar.bz2) = b72cc98ac387091adabf2ff5a2c8078bbb5a67d149361826b77ef5edddd9822ac9dab82b33e0778e5dad0687ef0aeb96174934f4546a861aaeeb4bbfafec4bea SHA512 (kernel-kabi-dw-5.18.0-0.rc4.20220429git38d741cb70b3074.37.tar.bz2) = 3906ec328e0b820562cf7a03cd0b51ed7e4c45bb8d2d7139ba62bec99399415e20b9fa6f9459181ccfd34f607fddae56e651703c64e1e3e197ff3a62a44df432