Re: [PATCH 0/6] soc: qcom: pmic_glink_altmode: fix drm bridge use-after-free

[Neil Armstrong]

On 23/02/2024 15:21, Johan Hovold wrote:
> On Fri, Feb 23, 2024 at 02:52:28PM +0100, Neil Armstrong wrote:
> > On 23/02/2024 13:51, Johan Hovold wrote:
> > > On Fri, Feb 23, 2024 at 12:03:10PM +0100, Neil Armstrong wrote:
> > > > On 23/02/2024 12:02, Neil Armstrong wrote:
>
> > > > > Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-fixes)
> > > > >
> > > > > [1/6] drm/bridge: aux-hpd: fix OF node leaks
> > > > >          https://cgit.freedesktop.org/drm/drm-misc/commit/?id=9ee485bdda68d6d3f5728cbe3150eb9013d7d22b
> > > > > [2/6] drm/bridge: aux-hpd: separate allocation and registration
> > > > >          (no commit info)
> > > > > [3/6] soc: qcom: pmic_glink_altmode: fix drm bridge use-after-free
> > > > >          (no commit info)
> > > > > [4/6] soc: qcom: pmic_glink: Fix boot when QRTR=m
> > > > >          (no commit info)
> > > > > [5/6] phy: qcom-qmp-combo: fix drm bridge registration
> > > > >          (no commit info)
> > > > > [6/6] phy: qcom-qmp-combo: fix type-c switch registration
> > > > >          (no commit info)
> > > >
> > > > To clarify, I only applied patch 1 to drm-misc-fixes
> > >
> > > Ok, but can you please not do that? :)
> > >
> > > These patches should go in through the same tree to avoid conflicts.
> > >
> > > I discussed this with Bjorn and Dmitry the other day and the conclusion
> > > was that it was easiest to take all of these through DRM.
> >
> > I only applied patch 1, which is a standalone fix and goes into a separate tree,
> > for the next patches it would be indeed simpler for them to go via drm-misc when
> > they are properly acked.
>
> But it is *not* standalone as I tried to explain above.
>
> So you have to drop it again as the later patches depend on it and
> cannot be merged (through a different tree) without it.

drm-misc branches cannot be rebased, it must be reverted, but it can still be applied
on drm-misc-next and I'll send a revert patch for drm-misc-fixes if needed, not a big deal.

> I thought you had all the acks you needed to take this through drm-misc,
> but we can wait a bit more if necessary (and there's no rush to get the
> first one in).

If you want it to be in v6.9, it's too late since the last drm-misc-next PR has been sent
yesterday (https://cgit.freedesktop.org/drm/drm-misc/tag/?h=drm-misc-next-2024-02-22)

Please ping Thomas or Maxime, perhaps it's not too late since the drm-misc-next tree
really closes on sunday.

Neil


> Johan