Skip to content

[rocky9_6] History Rebuild for kernel-5.14.0-570.25.1.el9_6 #399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile.rhelver
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RHEL_MINOR = 6
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 570.24.1
RHEL_RELEASE = 570.25.1

#
# ZSTREAM
Expand Down
1 change: 1 addition & 0 deletions block/blk-mq.c
Original file line number Diff line number Diff line change
Expand Up @@ -3193,6 +3193,7 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src,
rq->special_vec = rq_src->special_vec;
}
rq->nr_phys_segments = rq_src->nr_phys_segments;
rq->nr_integrity_segments = rq_src->nr_integrity_segments;
rq->ioprio = rq_src->ioprio;

if (rq->bio && blk_crypto_rq_bio_prep(rq, rq->bio, gfp_mask) < 0)
Expand Down
44 changes: 44 additions & 0 deletions ciq/ciq_backports/kernel-5.14.0-570.25.1.el9_6/fc0e982b.failed
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone

jira LE-3519
Rebuild_History Non-Buildable kernel-5.14.0-570.25.1.el9_6
commit-author Ming Lei <ming.lei@redhat.com>
commit fc0e982b8a3a169b1c654d9a1aa45bf292943ef2
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-5.14.0-570.25.1.el9_6/fc0e982b.failed

Make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone(),
otherwise requests cloned by device-mapper multipath will not have the
proper nr_integrity_segments values set, then BUG() is hit from
sg_alloc_table_chained().

Fixes: b0fd271d5fba ("block: add request clone interface (v2)")
Cc: stable@vger.kernel.org
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20250310115453.2271109-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit fc0e982b8a3a169b1c654d9a1aa45bf292943ef2)
Signed-off-by: Jonathan Maple <jmaple@ciq.com>

# Conflicts:
# block/blk-mq.c
diff --cc block/blk-mq.c
index 828c019b9156,f1030d589a1b..000000000000
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@@ -3193,7 -3314,7 +3193,11 @@@ int blk_rq_prep_clone(struct request *r
rq->special_vec = rq_src->special_vec;
}
rq->nr_phys_segments = rq_src->nr_phys_segments;
++<<<<<<< HEAD
+ rq->ioprio = rq_src->ioprio;
++=======
+ rq->nr_integrity_segments = rq_src->nr_integrity_segments;
++>>>>>>> fc0e982b8a3a (block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone)

if (rq->bio && blk_crypto_rq_bio_prep(rq, rq->bio, gfp_mask) < 0)
goto free_and_out;
* Unmerged path block/blk-mq.c
19 changes: 19 additions & 0 deletions ciq/ciq_backports/kernel-5.14.0-570.25.1.el9_6/rebuild.details.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v5.14~1..kernel-mainline: 309912
Number of commits in rpm: 9
Number of commits matched with upstream: 7 (77.78%)
Number of commits in upstream but not in rpm: 309905
Number of commits NOT found in upstream: 2 (22.22%)

Rebuilding Kernel on Branch rocky9_6_rebuild_kernel-5.14.0-570.25.1.el9_6 for kernel-5.14.0-570.25.1.el9_6
Clean Cherry Picks: 6 (85.71%)
Empty Cherry Picks: 1 (14.29%)
_______________________________

__EMPTY COMMITS__________________________
fc0e982b8a3a169b1c654d9a1aa45bf292943ef2 block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone

__CHANGES NOT IN UPSTREAM________________
Porting to Rocky Linux 9, debranding and Rocky branding'
Ensure aarch64 kernel is not compressed'
Loading