Skip to content

[rocky10_0] History Rebuild to kernel-6.12.0-55.19.1.el10_0 #394

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 6 commits into from
Jul 7, 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 = 0
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 55.18.1
RHEL_RELEASE = 55.19.1

#
# RHEL_REBASE_NUM
Expand Down
1 change: 1 addition & 0 deletions block/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ config BLK_CGROUP_RWSTAT

config BLK_CGROUP_PUNT_BIO
bool
default y

config BLK_DEV_BSG_COMMON
tristate
Expand Down
8 changes: 4 additions & 4 deletions block/blk-cgroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ struct blkcg_gq {
struct blkg_iostat_set iostat;

struct blkg_policy_data *pd[BLKCG_MAX_POLS];
#ifdef CONFIG_BLK_CGROUP_PUNT_BIO
spinlock_t async_bio_lock;
struct bio_list async_bios;
#endif
union {
struct work_struct async_bio_work;
struct work_struct free_work;
Expand All @@ -89,6 +85,10 @@ struct blkcg_gq {
int last_use;

struct rcu_head rcu_head;
#ifdef CONFIG_BLK_CGROUP_PUNT_BIO
RH_KABI_EXTEND(spinlock_t async_bio_lock)
RH_KABI_EXTEND(struct bio_list async_bios)
#endif
};

struct blkcg {
Expand Down
20 changes: 20 additions & 0 deletions ciq/ciq_backports/kernel-6.12.0-55.19.1.el10_0/rebuild.details.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v6.12~1..kernel-mainline: 52012
Number of commits in rpm: 9
Number of commits matched with upstream: 5 (55.56%)
Number of commits in upstream but not in rpm: 52007
Number of commits NOT found in upstream: 4 (44.44%)

Rebuilding Kernel on Branch rocky10_0_rebuild_kernel-6.12.0-55.19.1.el10_0 for kernel-6.12.0-55.19.1.el10_0
Clean Cherry Picks: 5 (100.00%)
Empty Cherry Picks: 0 (0.00%)
_______________________________

__EMPTY COMMITS__________________________

__CHANGES NOT IN UPSTREAM________________
Porting to Rocky Linux 10, debranding and Rocky Linux branding'
Add partial riscv64 support for build root'
Provide basic VisionFive 2 support'
block/Kconfig: Allow selecting BLK_CGROUP_PUNT_BIO
Loading