rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

kernel-5.19.0-0.rc7.53

Browse Source 
* Mon Jul 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc7.52]
- redhat: make kernel-zfcpdump-core to not provide kernel-core/kernel (Herton R. Krzesinski)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-07-18 08:34:58 -05:00
parent 188cc8581f
commit df37aba8e2
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
4 changed files with 22 additions and 17 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 = 49 RHEL_RELEASE = 53
# #
# ZSTREAM # ZSTREAM

25
kernel.spec
View File

@ -120,17 +120,17 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying # to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 0 %define debugbuildsenabled 1
# define buildid .local # define buildid .local
%define specversion 5.19.0 %define specversion 5.19.0
%define patchversion 5.19 %define patchversion 5.19
%define pkgrelease 0.rc6.20220714git4a57a8400075.49 %define pkgrelease 0.rc7.53
%define kversion 5 %define kversion 5
%define tarfile_release 5.19-rc6-115-g4a57a8400075 %define tarfile_release 5.19-rc7
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 19 %define patchlevel 19
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc6.20220714git4a57a8400075.49%{?buildid}%{?dist} %define specrelease 0.rc7.53%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 5.19.0 %define kabiversion 5.19.0
@ -871,12 +871,14 @@ The kernel meta package
# #
# This macro does requires, provides, conflicts, obsoletes for a kernel package. # This macro does requires, provides, conflicts, obsoletes for a kernel package.
# %%kernel_reqprovconf <subpackage> # %%kernel_reqprovconf [-o] <subpackage>
# It uses any kernel_<subpackage>_conflicts and kernel_<subpackage>_obsoletes # It uses any kernel_<subpackage>_conflicts and kernel_<subpackage>_obsoletes
# macros defined above. # macros defined above.
# #
%define kernel_reqprovconf \ %define kernel_reqprovconf(o) \
%if %{-o:0}%{!-o:1}\
Provides: kernel = %{specversion}-%{pkg_release}\ Provides: kernel = %{specversion}-%{pkg_release}\
%endif\
Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\ Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
@ -1270,9 +1272,9 @@ The meta-package for the %{1} kernel\
# #
# This macro creates a kernel-<subpackage> and its -devel and -debuginfo too. # This macro creates a kernel-<subpackage> and its -devel and -debuginfo too.
# %%define variant_summary The Linux kernel compiled for <configuration> # %%define variant_summary The Linux kernel compiled for <configuration>
# %%kernel_variant_package [-n <pretty-name>] [-m] <subpackage> # %%kernel_variant_package [-n <pretty-name>] [-m] [-o] <subpackage>
# #
%define kernel_variant_package(n:m) \ %define kernel_variant_package(n:mo) \
%package %{?1:%{1}-}core\ %package %{?1:%{1}-}core\
Summary: %{variant_summary}\ Summary: %{variant_summary}\
Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
@ -1280,7 +1282,7 @@ Provides: installonlypkg(kernel)\
%if %{-m:1}%{!-m:0}\ %if %{-m:1}%{!-m:0}\
Requires: kernel-core-uname-r = %{KVERREL}\ Requires: kernel-core-uname-r = %{KVERREL}\
%endif\ %endif\
%{expand:%%kernel_reqprovconf}\ %{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
%if %{?1:1} %{!?1:0} \ %if %{?1:1} %{!?1:0} \
%{expand:%%kernel_meta_package %{?1:%{1}}}\ %{expand:%%kernel_meta_package %{?1:%{1}}}\
%endif\ %endif\
@ -1330,7 +1332,7 @@ Cortex-A15 devices with LPAE and HW virtualisation support
%if %{with_zfcpdump} %if %{with_zfcpdump}
%define variant_summary The Linux kernel compiled for zfcpdump usage %define variant_summary The Linux kernel compiled for zfcpdump usage
%kernel_variant_package zfcpdump %kernel_variant_package -o zfcpdump
%description zfcpdump-core %description zfcpdump-core
The kernel package contains the Linux kernel (vmlinuz) for use by the The kernel package contains the Linux kernel (vmlinuz) for use by the
zfcpdump infrastructure. zfcpdump infrastructure.
@ -3137,6 +3139,9 @@ fi
# #
# #
%changelog %changelog
* Mon Jul 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc7.52]
- redhat: make kernel-zfcpdump-core to not provide kernel-core/kernel (Herton R. Krzesinski)
* Tue Jul 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc6.5a29232d870d.46] * Tue Jul 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc6.5a29232d870d.46]
- redhat/configs: Enable QAT devices for arches other than x86 (Vladis Dronov) - redhat/configs: Enable QAT devices for arches other than x86 (Vladis Dronov)

6
patch-5.19-redhat.patch
View File

@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index faa4880f25f7..6135cccdcf3f 100644 index 00fd80c5dd6e..7ab3609b69aa 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -1226,7 +1226,7 @@ index ee4da9ab8013..d395d11eadc4 100644
if (ret < 0) if (ret < 0)
goto err_allowedips; goto err_allowedips;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index ec6ac298d8de..ddce2807c680 100644 index 6a12a906a11e..463bcb0b62cd 100644
--- a/drivers/nvme/host/core.c --- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c
@@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@ -1638,7 +1638,7 @@ index a1b9be245560..aa8c493241c6 100644
PCI_ANY_ID, PCI_ANY_ID, }, PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index c95360a3c186..b7d7b4639a9e 100644 index 0917b05059b4..38cef4e394fb 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c --- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance); @@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance);

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.19-rc6-115-g4a57a8400075.tar.xz) = a99c19c35d4d1d9b1674b02072ad025cfa7adce3b826b932b72b3aa0818fbf2acb5b734680b2ddcc94cf88a2aaeac05123cdebda6f6756e114ae2c625f60b407 SHA512 (linux-5.19-rc7.tar.xz) = 128d3f3342465c26b83381099706bf0d8dc6eff3dcc386240fae3c9c333d041bbf9b82fefa3dc1048cd6c1c302a8e228eae49390110cff3830324a65b7d7374e
SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = 1f7fbb353bb18990a7cc2f1c8e39f592b24921d5635cda1de4cf233bc7a3d29bf59714768eb9cfe6ea42e9d86ea02813b496dd0e07bb47ae84c2a1b434fbf6a5 SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = d2fd7c91f9a7233e955b7c9899a78c4d35a43a0fe9dbda267e7a889bf886cb7300cba713acf375afcfe20e684322f95b94e9eb56e9dcbebbf86e543bfc0434cf
SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = 555f427595e56be3049d55245999a63ac54f1738cc0e5ef896bd2633749e05ec9db0d1fda4947f7af30ae9683a3da932ca5b0d458f0b986eb3592b76c436c983 SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = e48091c7569df7558744fe07eb2e1982f0deef471f313ac385d24485f1d59c982efc6fdb610606baa94e6d3a7f8a8753955f3357b89f684886becd4da26fdc27