Re: [git pull] drm for 7.2-rc1
From: Linus Torvalds
Date: Wed Jun 17 2026 - 05:53:22 EST
On Wed, 17 Jun 2026 at 07:19, Dave Airlie <airlied@xxxxxxxxx> wrote:
>
> None of them were too confusing, but the panfrost one isn't that
> straightforward and amdgpu ones are a bit tricky.
I think yours is wrong. You don't do that
op_ctx->rsvd_page_tables.count = pt_count;
that I think you should do..
Other than that my resolution seems identical (modulo some trivial
whitespace around the same area)
> The commit list looks fine but the diffstat looks wonky for some reason.
Yeah, that's garbage. Did you do it after the merge or before? If
before, it must have picked some completely wrong merge base.
Linus