[GIT PULL] Reset controller fixes for v7.0, part 2

[Krzysztof Kozlowski]

On Tue, Mar 24, 2026 at 10:55:47AM +0100, Philipp Zabel wrote:
> On Di, 2026-03-24 at 10:42 +0100, Philipp Zabel wrote:
> > Dear arm-soc maintainers,
> > 
> > The following changes since commit e0cf84109bc6c6768337123f1de24ff56b41c91b:
> > 
> >   reset: rzg2l-usbphy-ctrl: Check pwrrdy is valid before using it (2026-02-23 17:03:28 +0100)
> > 
> > are available in the Git repository at:
> > 
> >   https://git.pengutronix.de/git/pza/linux.git tags/reset-fixes-for-v7.0-2
> > 
> > for you to fetch changes up to a0e0c2f8c5f32b675f58e25a9338283cedb5ad2b:
> > 
> >   reset: spacemit: k3: Decouple composite reset lines (2026-03-23 12:25:47 +0100)
> > 
> > ----------------------------------------------------------------
> > 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.
> 
> It is important that this makes v7.0, as it fixes an incorrect binding
> that has not been part of a release and which has no users yet.
> 
> > * 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").
> 
> Because of this, commit fbffb8c7c7bb ("reset: gpio: fix double free in
> reset_add_gpio_aux_device() error path") introduces a merge conflict
> with reset/next:
> 
>   https://lore.kernel.org/all/acFRVzvV9Dww47v_@sirena.org.uk/
> 
> Should I resolve this myself by merging this tag in to reset/next as
> well, before submitting reset updates for v7.1?

Yes, please merge the fixes to your next branch. Or base next branch on
top of fixes commit, when starting next as new branch.

This merge conflict looks quite significant.

Best regards,
Krzysztof