kernel-6.15.0-61
* Mon May 26 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-61] - powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes
parent
73083e2a82
commit
227bcf7dd0
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 59
|
||||
RHEL_RELEASE = 61
|
||||
|
||||
#
|
||||
# RHEL_REBASE_NUM
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/922dc9908b4481e757f847d56581691560a791cc
|
||||
922dc9908b4481e757f847d56581691560a791cc powerpc: Fix struct termio related ioctl macros
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/2b54906ff5dde3a15ff82aefe0262b65a98c329a
|
||||
2b54906ff5dde3a15ff82aefe0262b65a98c329a redhat: make ENABLE_WERROR also enable OBJTOOL_WERROR
|
||||
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
* Mon May 26 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-61]
|
||||
- powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan)
|
||||
Resolves:
|
||||
|
||||
* Mon May 26 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-60]
|
||||
- Consolidate configs to common for 6.15 (Justin M. Forbes)
|
||||
- Linux v6.15.0
|
||||
Resolves:
|
||||
|
||||
* Thu May 22 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc7.d608703fcdd9.59]
|
||||
- Linux v6.15.0-0.rc7.d608703fcdd9
|
||||
Resolves:
|
||||
|
||||
13
kernel.spec
13
kernel.spec
@ -162,13 +162,13 @@ Summary: The Linux kernel
|
||||
%define specrpmversion 6.15.0
|
||||
%define specversion 6.15.0
|
||||
%define patchversion 6.15
|
||||
%define pkgrelease 0.rc7.250522gd608703fcdd9.59
|
||||
%define pkgrelease 61
|
||||
%define kversion 6
|
||||
%define tarfile_release 6.15-rc7-14-gd608703fcdd9
|
||||
%define tarfile_release 6.15
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 15
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc7.250522gd608703fcdd9.59%{?buildid}%{?dist}
|
||||
%define specrelease 61%{?buildid}%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 6.15.0
|
||||
|
||||
@ -4259,6 +4259,13 @@ fi\
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon May 26 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-61]
|
||||
- powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan)
|
||||
|
||||
* Mon May 26 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-60]
|
||||
- Consolidate configs to common for 6.15 (Justin M. Forbes)
|
||||
- Linux v6.15.0
|
||||
|
||||
* Thu May 22 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc7.d608703fcdd9.59]
|
||||
- Linux v6.15.0-0.rc7.d608703fcdd9
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
Makefile | 48 +-
|
||||
arch/arm/Kconfig | 4 +-
|
||||
arch/arm64/Kconfig | 2 +-
|
||||
arch/powerpc/include/uapi/asm/ioctls.h | 8 +-
|
||||
arch/s390/include/asm/ipl.h | 1 +
|
||||
arch/s390/kernel/ipl.c | 5 +
|
||||
arch/s390/kernel/setup.c | 4 +
|
||||
@ -76,7 +77,7 @@
|
||||
security/integrity/platform_certs/load_uefi.c | 6 +-
|
||||
security/lockdown/Kconfig | 13 +
|
||||
security/lockdown/lockdown.c | 11 +
|
||||
78 files changed, 2728 insertions(+), 208 deletions(-)
|
||||
79 files changed, 2732 insertions(+), 212 deletions(-)
|
||||
|
||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
||||
index 8f75ec177399..0c4bc4a2203d 100644
|
||||
@ -191,7 +192,7 @@ index 000000000000..85771d74c34f
|
||||
+
|
||||
+endmenu
|
||||
diff --git a/Makefile b/Makefile
|
||||
index a9edd0303653..8bc83b55c192 100644
|
||||
index c1cd1b5fc269..2e18aa0af6af 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
||||
@ -299,6 +300,25 @@ index a182295e6f08..a3cfce882d26 100644
|
||||
help
|
||||
For systems with 52-bit userspace VAs enabled, the kernel will attempt
|
||||
to maintain compatibility with older software by providing 48-bit VAs
|
||||
diff --git a/arch/powerpc/include/uapi/asm/ioctls.h b/arch/powerpc/include/uapi/asm/ioctls.h
|
||||
index 2c145da3b774..b5211e413829 100644
|
||||
--- a/arch/powerpc/include/uapi/asm/ioctls.h
|
||||
+++ b/arch/powerpc/include/uapi/asm/ioctls.h
|
||||
@@ -23,10 +23,10 @@
|
||||
#define TCSETSW _IOW('t', 21, struct termios)
|
||||
#define TCSETSF _IOW('t', 22, struct termios)
|
||||
|
||||
-#define TCGETA _IOR('t', 23, struct termio)
|
||||
-#define TCSETA _IOW('t', 24, struct termio)
|
||||
-#define TCSETAW _IOW('t', 25, struct termio)
|
||||
-#define TCSETAF _IOW('t', 28, struct termio)
|
||||
+#define TCGETA 0x40147417 /* _IOR('t', 23, struct termio) */
|
||||
+#define TCSETA 0x80147418 /* _IOW('t', 24, struct termio) */
|
||||
+#define TCSETAW 0x80147419 /* _IOW('t', 25, struct termio) */
|
||||
+#define TCSETAF 0x8014741c /* _IOW('t', 28, struct termio) */
|
||||
|
||||
#define TCSBRK _IO('t', 29)
|
||||
#define TCXONC _IO('t', 30)
|
||||
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
|
||||
index b0d00032479d..afb9544fb007 100644
|
||||
--- a/arch/s390/include/asm/ipl.h
|
||||
@ -1850,7 +1870,7 @@ index 2168b6cd7167..5d7cda175a0c 100644
|
||||
if (data->f01_container->dev.driver) {
|
||||
/* Driver already bound, so enable ATTN now. */
|
||||
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
|
||||
index 4f91a740c15f..4ad2ac193ffd 100644
|
||||
index 9d728800a862..cc4aebbcb30f 100644
|
||||
--- a/drivers/iommu/iommu.c
|
||||
+++ b/drivers/iommu/iommu.c
|
||||
@@ -8,6 +8,7 @@
|
||||
@ -3262,7 +3282,7 @@ index 64c3393e8270..827ab64621bb 100644
|
||||
}
|
||||
|
||||
diff --git a/kernel/module/main.c b/kernel/module/main.c
|
||||
index a2859dc3eea6..dda7d7026bbb 100644
|
||||
index 5c6ab20240a6..9f986fb39ef9 100644
|
||||
--- a/kernel/module/main.c
|
||||
+++ b/kernel/module/main.c
|
||||
@@ -65,6 +65,8 @@
|
||||
@ -3290,7 +3310,7 @@ index a2859dc3eea6..dda7d7026bbb 100644
|
||||
&modinfo_initstate,
|
||||
&modinfo_coresize,
|
||||
#ifdef CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC
|
||||
@@ -3228,6 +3232,11 @@ static int early_mod_check(struct load_info *info, int flags)
|
||||
@@ -3229,6 +3233,11 @@ static int early_mod_check(struct load_info *info, int flags)
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
@ -3302,7 +3322,7 @@ index a2859dc3eea6..dda7d7026bbb 100644
|
||||
err = rewrite_section_headers(info, flags);
|
||||
if (err)
|
||||
return err;
|
||||
@@ -3796,6 +3805,10 @@ void print_modules(void)
|
||||
@@ -3797,6 +3806,10 @@ void print_modules(void)
|
||||
pr_cont(" [last unloaded: %s%s]", last_unloaded_module.name,
|
||||
last_unloaded_module.taints);
|
||||
pr_cont("\n");
|
||||
|
||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-6.15-rc7-14-gd608703fcdd9.tar.xz) = 6ef8f9eeda778c796618aa6b49285cf131795b4aef3ccc0c322b003529ac34945520defac4d22ce8181a6bea3323815789f84d90c912f85e6cdcbb1171cfd8fb
|
||||
SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = f6827cd3ed7533ffa58f9bef0411d3d53ae580c3f2a582d4e5f522bd27fbd0a2c4087f72bd404e6af66c1962355eeef1729794cf25a8ad902c1e660ff2200f50
|
||||
SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = c5713daa00a05f081b714c1c0cda8d22adf282c5176fd6aa5e4488f997c3194ade76a42f4a5b013fce95199013741ef5c63415b99f95a24f833a1894e0dd2b21
|
||||
SHA512 (linux-6.15.tar.xz) = bbaffacae219ecc1f23b2f2539adb7ed38bfcb5e025db11200db410bb9acd7d5a29e5dd5e46a442f52e074aeb77a91e7288b4647e8b26e966aa3d2d607f6e782
|
||||
SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = b49eb25af4b0f1a14b4392b1ba77fa6ff52a0df6a45690ebf3aadc5c6e84eb318d8f6821ddb1fb97f9eca12715128b369b280066801a1c6469ab4ab695412319
|
||||
SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 6838cc1cde8c8df377c4b3e95e3073c7e96558b2d757bf194e154a4ff65287f3725ad7e656df5433f42b445e1a42c86d8f22c19d26a6cec73e21021ec78f4c14
|
||||
|
||||
Loading…
Reference in New Issue
Block a user