On Fri, 09 Aug 2024, Lucas De Marchi <lucas.demarchi@xxxxxxxxx> wrote: > On Fri, Aug 09, 2024 at 10:58:24AM GMT, Lucas De Marchi wrote: >>On Fri, Aug 09, 2024 at 04:23:47PM GMT, Jani Nikula wrote: >>>On Fri, 09 Aug 2024, Jani Nikula <jani.nikula@xxxxxxxxx> wrote: >>>>On Thu, 08 Aug 2024, Lucas De Marchi <lucas.demarchi@xxxxxxxxx> wrote: >>>>>On Thu, Aug 08, 2024 at 06:15:45PM GMT, Jani Nikula wrote: >>>>>>v2 of https://patchwork.freedesktop.org/series/136621/ >>>>>> >>>>>>Removed "drm/xe/tests: fix drvdata usage" from v1 in favour of >>>>>>"drm/xe/tests: remove unused leftover xe_call_for_each_device()" here. >>>>>> >>>>>>Due to the display dependency, I think it would be best to merge the >>>>>>whole thing via drm-intel-next, and do the first drm-intel-next pull >>>>>>request and backmerge from drm-next to drm-xe-next in fairly quick >>>>>>succession. >>>>> >>>>>I was waiting the drm-intel-next pull to do a backmerge as we started to >>>>>have some big divergences. I will try to review the missing patches to >>>>>expedite that. Are you planning a pull this week? >>>> >>>>Rodrigo? I think it's your shift. >>> >>>In the mean time, ack for merging this via drm-intel-next? >> >> >>Acked-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> > > oh. wait... but I don't think you will be able to merge the first patch > through drm-intel-next. > > $ git branch --contains 57ecead343e7 > + drm-tip > + drm-xe-next > * tip > + topic/xe-for-CI > > Sorry for not noticing that before. Alternatives: > > 1) > merge this patch via drm-xe-next, and possibly (if it unblocks more > patches on top), your 'drm/xe/tests: fix drvdata usage" from v1' via > drm-intel. > > 2) do not apply this and patch 10 until we are back in sync. > > ... something else? Yeah, something else. I resent patches 1-3 separately to be merged via drm-xe-next [1] and patch 4 to be merged via drm-intel-next [2]. Clean and straightforward. Let's do the rest once we're back in sync. BR, Jani. [1] https://lore.kernel.org/r/cover.1723458544.git.jani.nikula@xxxxxxxxx [2] https://lore.kernel.org/r/20240812103415.1540096-1-jani.nikula@xxxxxxxxx > > I don't have a preference. > > Lucas De Marchi > >> >>thanks >>Lucas De Marchi >> >>> >>>BR, >>>Jani. >>> >>>> >>>>BR, >>>>Jani. >>> >>>-- >>>Jani Nikula, Intel -- Jani Nikula, Intel
