diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2026-04-02 14:30:10 +0200 |
|---|---|---|
| committer | Philipp Zabel <p.zabel@pengutronix.de> | 2026-04-02 18:32:53 +0200 |
| commit | d373605cd514837d8a6de3d00c786d4bae6dbaf8 (patch) | |
| tree | 73a4fdb9df3c894d2a5216409651abc7174cc13c /drivers/staging/bcm/git@git.tavy.me:linux.git | |
| parent | f62fcdf8ab826ffc811552e29a6dd8544281fd97 (diff) | |
| parent | a0e0c2f8c5f32b675f58e25a9338283cedb5ad2b (diff) | |
Merge tag 'reset-fixes-for-v7.0-2' into reset/next
Reset controller fixes for v7.0, part 2
* Decouple spacemit K3 reset lines that were incorrectly coupled
together as one, but are in fact separate resets in hardware.
* Fix a double free in the reset_add_gpio_aux_device() error path.
This has already been fixed on reset/next by commit a9b95ce36de4
("reset: gpio: add a devlink between reset-gpio and its consumer").
* Fix the MODULE_AUTHOR string in the rzg2l-usbphy-ctrl driver.
We merge this into reset/next to resolve a conflict between commits
a9b95ce36de4 ("reset: gpio: add a devlink between reset-gpio and its
consumer") and fbffb8c7c7bb ("reset: gpio: fix double free in
reset_add_gpio_aux_device() error path").
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/staging/bcm/git@git.tavy.me:linux.git')
0 files changed, 0 insertions, 0 deletions