Skip to content

Commit 0570eb3

Browse files
committed
Rebuild rocky8_10 with kernel-4.18.0-553.32.1.el8_10
Rebuild_History BUILDABLE Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50% Number of commits in upstream range v4.18~1..master: 488125 Number of commits in rpm: 45 Number of commits matched with upstream: 23 (51.11%) Number of commits in upstream but not in rpm: 488102 Number of commits NOT found in upstream: 22 (48.89%) Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.32.1.el8_10 for kernel-4.18.0-553.32.1.el8_10 Clean Cherry Picks: 11 (47.83%) Empty Cherry Picks: 12 (52.17%) _______________________________ Full Details Located here: ciq/ciq_backports/kernel-4.18.0-553.32.1.el8_10/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 f61602d commit 0570eb3

35 files changed

+50099
-174
lines changed

Makefile.rhelver

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

1717
#
1818
# ZSTREAM

arch/arm64/kernel/probes/decode-insn.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@ arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *api)
104104
aarch64_insn_is_blr(insn) ||
105105
aarch64_insn_is_ret(insn)) {
106106
api->handler = simulate_br_blr_ret;
107-
} else if (aarch64_insn_is_ldr_lit(insn)) {
108-
api->handler = simulate_ldr_literal;
109-
} else if (aarch64_insn_is_ldrsw_lit(insn)) {
110-
api->handler = simulate_ldrsw_literal;
111107
} else {
112108
/*
113109
* Instruction cannot be stepped out-of-line and we don't
@@ -145,6 +141,17 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
145141
probe_opcode_t insn = le32_to_cpu(*addr);
146142
probe_opcode_t *scan_end = NULL;
147143
unsigned long size = 0, offset = 0;
144+
struct arch_probe_insn *api = &asi->api;
145+
146+
if (aarch64_insn_is_ldr_lit(insn)) {
147+
api->handler = simulate_ldr_literal;
148+
decoded = INSN_GOOD_NO_SLOT;
149+
} else if (aarch64_insn_is_ldrsw_lit(insn)) {
150+
api->handler = simulate_ldrsw_literal;
151+
decoded = INSN_GOOD_NO_SLOT;
152+
} else {
153+
decoded = arm_probe_decode_insn(insn, &asi->api);
154+
}
148155

149156
/*
150157
* If there's a symbol defined in front of and near enough to
@@ -162,7 +169,6 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
162169
else
163170
scan_end = addr - MAX_ATOMIC_CONTEXT_SIZE;
164171
}
165-
decoded = arm_probe_decode_insn(insn, &asi->api);
166172

167173
if (decoded != INSN_REJECTED && scan_end)
168174
if (is_probed_address_atomic(addr - 1, scan_end))

block/blk-rq-qos.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ static int rq_qos_wake_function(struct wait_queue_entry *curr,
223223

224224
data->got_token = true;
225225
smp_wmb();
226-
list_del_init(&curr->entry);
227226
wake_up_process(data->task);
227+
list_del_init_careful(&curr->entry);
228228
return 1;
229229
}
230230

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
Rebuild_History BUILDABLE
2+
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
3+
Number of commits in upstream range v4.18~1..master: 488125
4+
Number of commits in rpm: 45
5+
Number of commits matched with upstream: 23 (51.11%)
6+
Number of commits in upstream but not in rpm: 488102
7+
Number of commits NOT found in upstream: 22 (48.89%)
8+
9+
Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.32.1.el8_10 for kernel-4.18.0-553.32.1.el8_10
10+
Clean Cherry Picks: 11 (47.83%)
11+
Empty Cherry Picks: 12 (52.17%)
12+
_______________________________
13+
14+
__EMPTY COMMITS__________________________
15+
76a0e79bc84f466999fa501fce5bf7a07641b8a7 selinux,smack: don't bypass permissions check in inode_setsecctx hook
16+
337b8b0e4343567221ef8d88aac5e418208d4ac1 cifs: return ENOENT for DFS lookup_cache_entry()
17+
11c8b3f8493cb5253da42fcd178d9b4630063f96 cifs: don't take exclusive lock for updating target hints
18+
3deddb77fdd932df92f3b6a27a9cffed82c4fe1a cifs: handle cache lookup errors different than -ENOENT
19+
ee2be7d7c7f32783f60ee5fe59b91548a4571f10 gfs2: Replace gfs2_glock_queue_put with gfs2_glock_put_async
20+
99b8520c00711556d62a9261eec9acfac94ecc9b gfs2: Remove unnecessary function prototype
21+
0a0383a93e5d28f2873a72b8378c2b36404e431e gfs2: Rename GLF_REPLY_PENDING to GLF_HAVE_REPLY
22+
1fb5f67e21805333daca4b0c96416254de96400e gfs2: Rename GLF_FROZEN to GLF_HAVE_FROZEN_REPLY
23+
edeb180f1c8cfe2e789109766b636430adb5a0a3 gfs2: Rename handle_callback to request_demote
24+
c8758ad005c98b15cd8b7a559dc51f8ddbc56d0a gfs2: Invert the GLF_INITIAL flag
25+
30e388d573673474cbd089dec83688331c117add gfs2: Switch to a per-filesystem glock workqueue
26+
767fd5a0160774178a597b7a7b6e07915fe00efa gfs2: Revise glock reference counting model
27+
28+
__CHANGES NOT IN UPSTREAM________________
29+
Adding prod certs and changed cert date to 20210620
30+
Adding Rocky secure boot certs
31+
Fixing vmlinuz removal
32+
Fixing UEFI CA path
33+
Porting to 8.10, debranding and Rocky branding
34+
Fixing pesign_key_name values
35+
irqchip/gic-v4: Correctly deal with set_affinity on lazily-mapped VPEs
36+
irqchip/gic-v4: Don't allow a VMOVP on a dying VPE
37+
blk-rq-qos: fix crash on rq_qos_wait vs. rq_qos_wake_function race
38+
gfs2: fix double destroy_workqueue error
39+
KVM: selftests: memslot_perf_test: increase guest sync timeout
40+
vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans
41+
md/raid5: Wait sync io to finish before changing group cnt
42+
xfrm: fix one more kernel-infoleak in algo dumping
43+
netfilter: nf_reject_ipv6: fix potential crash in nf_send_reset6()
44+
netfilter: nf_reject: Fix build warning when CONFIG_BRIDGE_NETFILTER=n
45+
netfilter: nf_reject_ipv6: fix nf_reject_ip6_tcphdr_put()
46+
gfs2: Prevent inode creation race
47+
gfs2: Only defer deletes when we have an iopen glock
48+
arm64: probes: Remove broken LDR (literal) uprobe support
49+
net: avoid potential underflow in qdisc_pkt_len_init() with UFO
50+
xfrm: validate new SA's prefixlen using SA family when sel.family is unset

0 commit comments

Comments
 (0)