[Intel-xe] [PATCH] fixup! drm/xe/display: Add intel_pps support too

Lucas De Marchi lucas.demarchi at intel.com
Fri May 12 18:07:15 UTC 2023


On Fri, May 12, 2023 at 10:01:05AM -0400, Rodrigo Vivi wrote:
>On Thu, May 11, 2023 at 03:33:29PM +0300, Jani Nikula wrote:
>> On Wed, 10 May 2023, Lucas De Marchi <lucas.demarchi at intel.com> wrote:
>> > On Wed, May 10, 2023 at 07:02:20PM +0300, Jani Nikula wrote:
>> >>This is an unrelated, unneeded change in "drm/xe/display: Add intel_pps
>> >>support too".
>> >>
>> >>After that gets applied, "drm/xe/display: Add intel_pps support too"
>> >>should itself be a fixup to "drm/xe/display: Implement display support".
>> >>
>> >>Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> >
>> >
>> > Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>
>>
>> Thanks, pushed to drm-xe-next.
>>
>> Rodrigo, what would be the best way to add a git rebase todo list for
>> you?
>
>An email here is fine.
>
>I'm going to run a git rebase clean-up today or next monday.
>
>what do I need to do besides taking care of the fixup and remove the dummy
>commits?
>
>(my only rule is that the rebase clean-up git diff HEAD..origin/drm-xe-next needs to come empty)

one alternative is:  take note of the commit you started from
(<original-head>  belo) and do the rebase yourself. Then push it to a
remote and send it here.

As long as there are just a few people doing that, it may scale better
when there are multiple fixups. Then when we do the rebase clean-up, we
basically swap out the range <fork-commit>..<original-head> with
<fork-commit>..<modified-head>


A simple git range-diff <original-head>...<modified-head> is sufficient
to double check the changes.


Lucas De Marchi


More information about the Intel-xe mailing list