From: Philipp Zabel
Date: Thu, 2 Apr 2026 12:30:10 +0000 (+0200)
Subject: Merge tag 'reset-fixes-for-v7.0-2' into reset/next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d373605cd514837d8a6de3d00c786d4bae6dbaf8;p=thirdparty%2Flinux.git
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
---
d373605cd514837d8a6de3d00c786d4bae6dbaf8