diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-03-21 10:02:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-03-21 10:02:36 +0300 |
| commit | f6472b17933f9adb825e7c7da31f7b7b2edb1950 (patch) | |
| tree | 84cca5e27843ed65fd49e62352d0a1de582470be /include/linux/device | |
| parent | 763aacf86f1baefb134c70813aa8c72d1675d738 (diff) | |
| parent | f338e77383789c0cae23ca3d48adcc5e9e137e3c (diff) | |
| download | linux-f6472b17933f9adb825e7c7da31f7b7b2edb1950.tar.xz | |
Merge tag 'v7.0-rc4' into timers/core, to resolve conflict
Resolve conflict between this change in the upstream kernel:
4c652a47722f ("rseq: Mark rseq_arm_slice_extension_timer() __always_inline")
... and this pending change in timers/core:
0e98eb14814e ("entry: Prepare for deferred hrtimer rearming")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/device')
| -rw-r--r-- | include/linux/device/bus.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index 99c3c83ea520..63de5f053c33 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -35,6 +35,8 @@ struct fwnode_handle; * otherwise. It may also return error code if determining that * the driver supports the device is not possible. In case of * -EPROBE_DEFER it will queue the device for deferred probing. + * Note: This callback may be invoked with or without the device + * lock held. * @uevent: Called when a device is added, removed, or a few other things * that generate uevents to add the environment variables. * @probe: Called when a new device or driver add to this bus, and callback |