Re: [PATCH 00/31] Preparatory patches for BCM2712 (Pi5) support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, 24 Jun 2024 at 15:19, Maxime Ripard <mripard@xxxxxxxxxx> wrote:
>
> Hi,
>
> On Fri, Jun 21, 2024 at 11:16:20AM GMT, Dave Stevenson wrote:
> > Morning Maxime
> >
> > On Fri, 21 Jun 2024 at 09:55, Maxime Ripard <mripard@xxxxxxxxxx> wrote:
> > >
> > > Hi Dave,
> > >
> > > Thanks for taking the time to send this.
> > >
> > > I've gone through most of the patches and it looks pretty good already,
> > > but I have a few general remarks:
> > >
> > >   - We merged in drm-misc-next the new HDMI infrastructure recently and
> > >     it will heavily conflict with some of these patches, so you need to
> > >     rebase against either linux-next or drm-misc-next.
> >
> > Unless I've really messed up, this is already against drm-misc-next -
> > sorry for not stating that.
> > I've just pulled and rebased again, but I believe the top commit from
> > the tree I created the patches against was
> > c1391205754f drm/tests: add drm_hdmi_state_helper_test MODULE_DESCRIPTION()
> > merged yesterday. I certainly had my VEC patches in the tree.
>
> Sorry, that must be my fault then :)
>
> I saw some patches had what I thought was vc4 prior refactoring, but if
> you're on top of current drm-misc-next, it's all good.

The tree is definitely based on drm-misc-next, and all the tests I've
done are fine. It's still possible that there is an error due to the
refactor, but I hope not.

> > >   - The author and SoB fields for my patches don't match anymore,
> > >     possibly due to mailmap doing its magic.
> >
> > Too much magic in git :-(
> > I went through and updated all your SoB fields, but mailmap appears to
> > mean that the author shown by git log is not the same as the patches
> > created by git format-patch. Never believe what you see. (That feels
> > like a bug in git format-patch).
>
> The duality of a bug/feature :)
>
> > >     You can fix this by using, for the SoB:
> > >     git filter-branch --msg-filter 'sed -i s/maxime@xxxxxxxxxx/mripard@xxxxxxxxxx/' drm-misc-next..
> > >
> > >     And for the authorship:
> > >     git commit --amend --author="Maxime Ripard <mripard@xxxxxxxxxx>"
> > >     for each commit.
> > >
> > >   - All of the fixes need Fixes that are currently missing on most tags
> >
> > Just as long as no one tries pulling them all back to stable. The
> > number of dependencies would be huge in many cases.
>
> This will probably happen still due to AUTOSEL. Is there any fix that
> shouldn't be backported?

If they backport cleanly then they should all be fine, but I fear that
things like the HDMI infrastructure changes will mean that they won't
(I certainly had a few conflicts in rebasing onto the latest
drm-misc-next).
I guess it's a case of seeing what happens.

  Dave



[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux