Re: [git pull] drm for 7.2-rc1
From: Dave Airlie
Date: Wed Jun 17 2026 - 06:05:11 EST
On Wed, 17 Jun 2026 at 19:38, Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> 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;
Yes I think that is missing in mine, good catch.
>
> 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.
I did it from a completely different tree where I have drm-next and
origin/master not sure where it picked the base from there, it has no
insight into my merge tree at all.
Dave.