[packages/kernel/LINUX_6_12] Up to 6.12.29
arekm
arekm at pld-linux.org
Sun May 18 17:28:09 CEST 2025
commit 9e3b9080c1124232a28d41d9c74ae3bba5954b25
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun May 18 16:58:20 2025 +0200
Up to 6.12.29
kernel-aufs.patch | 20 ++++++++++----------
kernel-x86.config | 1 +
kernel.spec | 4 ++--
3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index f1712775..e83f8406 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -53,7 +53,7 @@
%define rel 1
%define basever 6.12
-%define postver .28
+%define postver .29
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -107,7 +107,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
# Source0-md5: 844fae6a58c7f43af44d8cea8484b4a1
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: 7dbccee430bceac2bd857d5939ebe385
+# Patch0-md5: bd89a78dfa8629bb0cc57d6fd9f547ed
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index 1a0f994a..51ff0d96 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -39813,14 +39813,14 @@ index 479480f25a6c0..ba3477c30e294 100644
error = -EINVAL;
-@@ -623,6 +641,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -586,6 +586,7 @@ static int loop_change_fd(struct loop_de
+ disk_force_media_change(lo->lo_disk);
blk_mq_freeze_queue(lo->lo_queue);
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
- lo->lo_backing_file = file;
+ lo->lo_backing_virt_file = virt_file;
- lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
- mapping_set_gfp_mask(file->f_mapping,
- lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
+ loop_assign_backing_file(lo, file);
+ loop_update_dio(lo);
+ blk_mq_unfreeze_queue(lo->lo_queue);
@@ -645,6 +664,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
@@ -39844,7 +39844,7 @@ index 479480f25a6c0..ba3477c30e294 100644
{
struct file *file = fget(config->fd);
+ struct file *f, *virt_file = NULL;
- struct address_space *mapping;
+ struct queue_limits lim;
int error;
loff_t size;
@@ -1052,6 +1076,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
@@ -39861,14 +39861,14 @@ index 479480f25a6c0..ba3477c30e294 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
* here to avoid changing device under exclusive owner.
-@@ -1108,6 +1139,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1084,6 +1085,7 @@ static int loop_configure(struct loop_de
+
lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
lo->lo_device = bdev;
- lo->lo_backing_file = file;
+ lo->lo_backing_virt_file = virt_file;
- lo->old_gfp_mask = mapping_gfp_mask(mapping);
- mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
+ loop_assign_backing_file(lo, file);
+ lim = queue_limits_start_update(lo->lo_queue);
@@ -1150,6 +1182,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
bd_abort_claiming(bdev, loop_configure);
out_putf:
diff --git a/kernel-x86.config b/kernel-x86.config
index cb3a84b8..7fe6fb42 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -134,6 +134,7 @@ MITIGATION_SPECTRE_V1 x86=y
MITIGATION_SPECTRE_V2 x86=y
MITIGATION_SRBDS x86=y
MITIGATION_SSB x86=y
+MITIGATION_ITS x86_64=y
#- file kernel/power/Kconfig goes here
#- file drivers/acpi/Kconfig goes here
APM i386=m
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/9e3b9080c1124232a28d41d9c74ae3bba5954b25
More information about the pld-cvs-commit
mailing list