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

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

* 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-28 08:10:31 -05:00
parent a57d8cc0d8
commit 157be69bed
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
16 changed files with 23 additions and 11 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.
# Do not trim this comment.
RHEL_RELEASE = 35
RHEL_RELEASE = 36
#
# Early y+1 numbering

1
kernel-aarch64-debug-fedora.config
View File

@ -722,6 +722,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-aarch64-fedora.config
View File

@ -722,6 +722,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-armv7hl-debug-fedora.config
View File

@ -744,6 +744,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-armv7hl-fedora.config
View File

@ -744,6 +744,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -723,6 +723,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-armv7hl-lpae-fedora.config
View File

@ -723,6 +723,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-ppc64le-debug-fedora.config
View File

@ -521,6 +521,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-ppc64le-fedora.config
View File

@ -520,6 +520,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-s390x-debug-fedora.config
View File

@ -525,6 +525,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-s390x-fedora.config
View File

@ -524,6 +524,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-x86_64-debug-fedora.config
View File

@ -568,6 +568,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

1
kernel-x86_64-fedora.config
View File

@ -567,6 +567,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_FD_RAWCMD is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_IO_TRACE=y

12
kernel.spec
View File

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

2
patch-5.18-redhat.patch
View File

@ -2110,7 +2110,7 @@ index ccd4d3f91c98..e64643e3e364 100644
enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
{
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index a890428bcc1a..e71813290f0b 100644
index fe6efb24d151..85b185391da7 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -508,4 +508,25 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.18-rc4-50-g46cf2c613f4b10e.tar.xz) = 56037260203f3198d73fbad34a3a0b0a28393720ac216ed83467960c88c638db6d2c907bad63f655ab910c4001e21477cf626250881fd0bb6afd0abb32f2022d
SHA512 (kernel-abi-stablelists-5.18.0-0.rc4.20220427git46cf2c613f4b10e.35.tar.bz2) = e3a5a9aada0b04167a34dda8df566ff5d3e817d7e36787d298c4d75379f93a8c7ae5e3d2129d4bc0c47359979344d95a03edef91c2cc78d13bcf8a91acfa1528
SHA512 (kernel-kabi-dw-5.18.0-0.rc4.20220427git46cf2c613f4b10e.35.tar.bz2) = a377aff8dbe5f55feeeb856278ac7bc860ef15b1c170cfe7103af9b7479c6bbdbf0bcc8e4ffbb26f75ffa0f7a4d8f1478cd2323554bd9a6e48885a990952a8c2
SHA512 (linux-5.18-rc4-64-g8f4dd16603ce834.tar.xz) = e8b430a4bef0d75524b3f054f53d4859d65ff65d10849b3f98ea2a1cd4c76c8fd28800e0218963afb9243bf9a6264a686bea7b8e8df70e15284e266926eb32b2
SHA512 (kernel-abi-stablelists-5.18.0-0.rc4.20220428git8f4dd16603ce834.36.tar.bz2) = 948287c75068db716fa5982120c22fdaaffb2c28228ce3ac12e60663bd802a7d38fee92c07cca8447e28d4372f2d247d99e9d913c00dbbd918f84c50e4a846d4
SHA512 (kernel-kabi-dw-5.18.0-0.rc4.20220428git8f4dd16603ce834.36.tar.bz2) = b72cc98ac387091adabf2ff5a2c8078bbb5a67d149361826b77ef5edddd9822ac9dab82b33e0778e5dad0687ef0aeb96174934f4546a861aaeeb4bbfafec4bea