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

kernel-6.7.0-0.rc2.22

Browse Source 
* Mon Nov 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.7.0-0.rc2.22]
- Fix s390 zfcpfdump bpf build failures for cgroups (Don Zickus)
- Linux v6.7.0-0.rc2
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2023-11-20 07:52:53 -06:00
parent 387d0e4c2d
commit 5a157fb0cc
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
4 changed files with 26 additions and 16 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 = 19 RHEL_RELEASE = 22
# #
# RHEL_REBASE_NUM # RHEL_REBASE_NUM

16
kernel.spec
View File

@ -163,13 +163,13 @@ Summary: The Linux kernel
%define specrpmversion 6.7.0 %define specrpmversion 6.7.0
%define specversion 6.7.0 %define specversion 6.7.0
%define patchversion 6.7 %define patchversion 6.7
%define pkgrelease 0.rc1.20231117git7475e51b8796.19 %define pkgrelease 0.rc2.22
%define kversion 6 %define kversion 6
%define tarfile_release 6.7-rc1-125-g7475e51b8796 %define tarfile_release 6.7-rc2
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 7 %define patchlevel 7
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc1.20231117git7475e51b8796.19%{?buildid}%{?dist} %define specrelease 0.rc2.22%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 6.7.0 %define kabiversion 6.7.0
@ -3709,6 +3709,16 @@ fi\
# #
# #
%changelog %changelog
* Mon Nov 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.7.0-0.rc2.22]
- Fix s390 zfcpfdump bpf build failures for cgroups (Don Zickus)
- Linux v6.7.0-0.rc2
* Sun Nov 19 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.7.0-0.rc1.037266a5f723.21]
- Linux v6.7.0-0.rc1.037266a5f723
* Sat Nov 18 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.7.0-0.rc1.791c8ab095f7.20]
- Linux v6.7.0-0.rc1.791c8ab095f7
* Fri Nov 17 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.7.0-0.rc1.7475e51b8796.19] * Fri Nov 17 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.7.0-0.rc1.7475e51b8796.19]
- Linux v6.7.0-0.rc1.7475e51b8796 - Linux v6.7.0-0.rc1.7475e51b8796

18
patch-6.7-redhat.patch
View File

@ -125,7 +125,7 @@ index 000000000000..effb81d04bfd
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index ede0bd241056..c5fc72ae0c20 100644 index 724c79bebe72..3d43997c2197 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -2070,10 +2070,10 @@ index 605013d3ee83..59d7ac663316 100644
{ MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004,
PCI_ANY_ID, PCI_ANY_ID }, PCI_ANY_ID, PCI_ANY_ID },
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 32d1e73e46ee..2370195b61b7 100644 index 03348f605c2e..fe30dee3d218 100644
--- a/drivers/scsi/qla2xxx/qla_os.c --- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -8114,6 +8114,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { @@ -8122,6 +8122,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
}; };
static struct pci_device_id qla2xxx_pci_tbl[] = { static struct pci_device_id qla2xxx_pci_tbl[] = {
@ -2081,7 +2081,7 @@ index 32d1e73e46ee..2370195b61b7 100644
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },
@@ -8126,13 +8127,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -8134,13 +8135,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) },
@ -2121,7 +2121,7 @@ index 675332e49a7b..4a3cbddacef1 100644
}; };
MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 530918cbfce2..a73f6df35334 100644 index fa00dd503cbf..a93a331d023d 100644
--- a/drivers/scsi/sd.c --- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c
@@ -118,6 +118,14 @@ static const char *sd_cache_types[] = { @@ -118,6 +118,14 @@ static const char *sd_cache_types[] = {
@ -2139,7 +2139,7 @@ index 530918cbfce2..a73f6df35334 100644
static void sd_set_flush_flag(struct scsi_disk *sdkp) static void sd_set_flush_flag(struct scsi_disk *sdkp)
{ {
bool wc = false, fua = false; bool wc = false, fua = false;
@@ -4048,6 +4056,8 @@ static int __init init_sd(void) @@ -4041,6 +4049,8 @@ static int __init init_sd(void)
goto err_out_class; goto err_out_class;
} }
@ -3642,7 +3642,7 @@ index 000000000000..616692b1ac11
+ +
+#endif /* __RH_MESSAGES_H */ +#endif /* __RH_MESSAGES_H */
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 973b5e5ae2dd..3c9f6d39cbd8 100644 index cb6406f485a9..71e1f15d9dce 100644
--- a/scripts/mod/modpost.c --- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@ -3653,7 +3653,7 @@ index 973b5e5ae2dd..3c9f6d39cbd8 100644
static bool module_enabled; static bool module_enabled;
/* Are we using CONFIG_MODVERSIONS? */ /* Are we using CONFIG_MODVERSIONS? */
@@ -1985,6 +1986,12 @@ static void write_buf(struct buffer *b, const char *fname) @@ -1987,6 +1988,12 @@ static void write_buf(struct buffer *b, const char *fname)
} }
} }
@ -3666,7 +3666,7 @@ index 973b5e5ae2dd..3c9f6d39cbd8 100644
static void write_if_changed(struct buffer *b, const char *fname) static void write_if_changed(struct buffer *b, const char *fname)
{ {
char *tmp; char *tmp;
@@ -2045,6 +2052,7 @@ static void write_mod_c_file(struct module *mod) @@ -2047,6 +2054,7 @@ static void write_mod_c_file(struct module *mod)
add_depends(&buf, mod); add_depends(&buf, mod);
add_moddevtable(&buf, mod); add_moddevtable(&buf, mod);
add_srcversion(&buf, mod); add_srcversion(&buf, mod);

6
sources
View File

@ -1,5 +1,5 @@
SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd
SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6
SHA512 (linux-6.7-rc1-125-g7475e51b8796.tar.xz) = f67b46dae6ad2afd8dba540d1f23d7c3d7780f2f760f5930291db6951269858cfdc25bcd5d536c92f3cf4523276c9f9310b254b3e013fedf8b0e2726cbe6be6d SHA512 (linux-6.7-rc2.tar.xz) = 138db90ac416fdc44e9a6413562df92e73d975ab669da56d8d6c2ddd43f18f399ff79aee1c7af7816d3a9a2d6f9000a65d291b870f7652842b6f2cd0e083607c
SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 84b18aa1c958802248498c5143f981bcecd7821117e2b6df51d3e73dfa615ca3bda6a6230386a98e2a6dbcdb531c8428b79100a7e43c84354f1368682df1bba4 SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 9e3215de07c1fe043102ebfb649bf8bd69540285aa6af6e9a71a33d4fe8684478e7da3b38f329dce7f4ecd2a9f608b18f7f3a769407275fd4c4e795461991b7f
SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 763fa4be1b8522915babddee2debe5a7a6060bf355b3c68824cc8af3387f87c8d6b391ac0bc734b0cae50e6a97bafc411178a339fd997fc8fae8f50af3408c2e SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = d052674a1c0d7b3d601dc3b739bbc97401ea3432cd281c6cd46f031aa0702283bd718084121518b7bb0ed321bbfeb86757fc25ba2ddf8c6d8e141705ca886f11