Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 21 May 2021 11:45:17 +1000

Hi all,

On Thu, 20 May 2021 10:19:10 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
> 
>   drivers/gpu/drm/i915/i915_mm.c
> 
> between commit:
> 
>   293837b9ac8d ("Revert "i915: fix remap_io_sg to verify the pgprot"")
> 
> from Linus' tree and commit:
> 
>   ec279384c6a0 ("drm/i915: Initialize err in remap_io_sg()")
> 
> from the drm-intel tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> 
> diff --cc drivers/gpu/drm/i915/i915_mm.c
> index 9a777b0ff59b,25576fa73ff0..000000000000
> --- a/drivers/gpu/drm/i915/i915_mm.c
> +++ b/drivers/gpu/drm/i915/i915_mm.c
> @@@ -82,13 -46,8 +82,13 @@@ int remap_io_sg(struct vm_area_struct *
>   		unsigned long addr, unsigned long size,
>   		struct scatterlist *sgl, resource_size_t iobase)
>   {
>  -	unsigned long pfn, len, remapped = 0;
>  +	struct remap_pfn r = {
>  +		.mm = vma->vm_mm,
>  +		.prot = vma->vm_page_prot,
>  +		.sgt = __sgt_iter(sgl, use_dma(iobase)),
>  +		.iobase = iobase,
>  +	};
> - 	int err;
> + 	int err = 0;
>   
>   	/* We rely on prevalidation of the io-mapping to skip track_pfn(). */
>   	GEM_BUG_ON((vma->vm_flags & EXPECTED_FLAGS) != EXPECTED_FLAGS);

This is now a conflict between the drm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell