Skip to content

Commit 072c272

Browse files
committed
Rebuild rocky10_0 with kernel-6.12.0-55.19.1.el10_0
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%) _______________________________ Full Details Located here: ciq/ciq_backports/kernel-6.12.0-55.19.1.el10_0/rebuild.details.txt Includes: * git commit header above * Empty Commits with upstream SHA * RPM ChangeLog Entries that could not be matched Individual Empty Commit failures contained in the same containing directory. The git message for empty commits will have the path for the failed commit. File names are the first 8 characters of the upstream SHA
1 parent d44b5e2 commit 072c272

29 files changed

+188353
-5
lines changed
File renamed without changes.

Makefile.rhelver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RHEL_MINOR = 0
1212
#
1313
# Use this spot to avoid future merge conflicts.
1414
# Do not trim this comment.
15-
RHEL_RELEASE = 55.18.1
15+
RHEL_RELEASE = 55.19.1
1616

1717
#
1818
# RHEL_REBASE_NUM

block/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ config BLK_CGROUP_RWSTAT
4444

4545
config BLK_CGROUP_PUNT_BIO
4646
bool
47+
default y
4748

4849
config BLK_DEV_BSG_COMMON
4950
tristate

block/blk-cgroup.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ struct blkcg_gq {
7373
struct blkg_iostat_set iostat;
7474

7575
struct blkg_policy_data *pd[BLKCG_MAX_POLS];
76-
#ifdef CONFIG_BLK_CGROUP_PUNT_BIO
77-
spinlock_t async_bio_lock;
78-
struct bio_list async_bios;
79-
#endif
8076
union {
8177
struct work_struct async_bio_work;
8278
struct work_struct free_work;
@@ -89,6 +85,10 @@ struct blkcg_gq {
8985
int last_use;
9086

9187
struct rcu_head rcu_head;
88+
#ifdef CONFIG_BLK_CGROUP_PUNT_BIO
89+
RH_KABI_EXTEND(spinlock_t async_bio_lock)
90+
RH_KABI_EXTEND(struct bio_list async_bios)
91+
#endif
9292
};
9393

9494
struct blkcg {
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Rebuild_History BUILDABLE
2+
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
3+
Number of commits in upstream range v6.12~1..kernel-mainline: 52012
4+
Number of commits in rpm: 9
5+
Number of commits matched with upstream: 5 (55.56%)
6+
Number of commits in upstream but not in rpm: 52007
7+
Number of commits NOT found in upstream: 4 (44.44%)
8+
9+
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
10+
Clean Cherry Picks: 5 (100.00%)
11+
Empty Cherry Picks: 0 (0.00%)
12+
_______________________________
13+
14+
__EMPTY COMMITS__________________________
15+
16+
__CHANGES NOT IN UPSTREAM________________
17+
Porting to Rocky Linux 10, debranding and Rocky Linux branding'
18+
Add partial riscv64 support for build root'
19+
Provide basic VisionFive 2 support'
20+
block/Kconfig: Allow selecting BLK_CGROUP_PUNT_BIO

0 commit comments

Comments
 (0)