Re: linux-next: build failure after merge of the drm tree

[Vlastimil Babka (SUSE)]

On 6/16/26 15:14, Mark Brown wrote:
> Hi all,
> 
> After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> /tmp/next/build/drivers/gpu/drm/panthor/panthor_mmu.c:1251:6: error: unused variable 'ret' [-Werror,-Wunused-variable]
>  1251 |         int ret;
>       |             ^~~
> 
> Caused by commit
> 
>   6bb0009862c5f (mm/slab: improve kmem_cache_alloc_bulk)
> 
> interacting with changes in the drm tree.  I have applied the fixup
> below and can carry as needed.

Initially there was a conflict between drm and slab and your resolution
removed that line:
https://lore.kernel.org/all/ahoZ7OCzxTAbGMtO@xxxxxxxxxxxxx/

I think nothing has changed except that the slab part was merged to mainline
since. Maybe that changed the ordering of the two trees and you had to redo
the conflict resolution?

> diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c
> index 3151de6aa1bae..10e32fe26f7e4 100644
> --- a/drivers/gpu/drm/panthor/panthor_mmu.c
> +++ b/drivers/gpu/drm/panthor/panthor_mmu.c
> @@ -1248,7 +1248,6 @@ static int panthor_vm_op_ctx_prealloc_pts(struct panthor_vm_op_ctx *op_ctx)
>  {
>  	u64 size = op_ctx->va.range;
>  	u64 va = op_ctx->va.addr;
> -	int ret;
>  
>  	/* L1, L2 and L3 page tables.
>  	 * We could optimize L3 allocation by iterating over the sgt and merging