[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: fe513c2ef0a172a58f158e2e70465c4317f0a9a2
WARNING: Author mismatch between patch and upstream commit:
Backport author: Alexey Nepomnyashih<sdl@xxxxxxxx>
Commit author: Thomas Gleixner<tglx@xxxxxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: e67534bd31d7)
6.1.y | Present (different SHA1: ea2cdf4da093)
5.15.y | Present (different SHA1: bc9356513d56)
5.10.y | Not found
Note: The patch differs from the upstream commit:
---
1: fe513c2ef0a17 ! 1: 1f8efe18f8487 static_call: Replace pointless WARN_ON() in static_call_module_notify()
@@ Metadata
## Commit message ##
static_call: Replace pointless WARN_ON() in static_call_module_notify()
+ commit fe513c2ef0a172a58f158e2e70465c4317f0a9a2 upstream.
+
static_call_module_notify() triggers a WARN_ON(), when memory allocation
fails in __static_call_add_module().
@@ Commit message
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Link: https://lkml.kernel.org/r/8734mf7pmb.ffs@tglx
+ Signed-off-by: Alexey Nepomnyashih <sdl@xxxxxxxx>
- ## kernel/static_call_inline.c ##
-@@ kernel/static_call_inline.c: static int static_call_module_notify(struct notifier_block *nb,
+ ## kernel/static_call.c ##
+@@ kernel/static_call.c: static int static_call_module_notify(struct notifier_block *nb,
case MODULE_STATE_COMING:
ret = static_call_add_module(mod);
if (ret) {
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y | Success | Success |
