linux-next: manual merge of the folio tree with the drm-intel tree

linux-next: manual merge of the folio tree with the drm-intel tree

[broonie]

Hi all,

Today's linux-next merge of the folio tree got a conflict in:

  drivers/gpu/drm/drm_cache.c

between commit:

  7938f4218168a ("dma-buf-map: Rename to iosys-map")

from the drm-intel tree and commit:

  96160c2f78bd1 ("mm: don't include <linux/memremap.h> in <linux/mm.h>")

from the folio 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/drm_cache.c
index 4b0da6baff78e,50b8a088f763a..0000000000000
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@@ -27,11 -27,11 +27,11 @@@
  /*
   * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
   */
- 
 -#include <linux/dma-buf-map.h>
 +#include <linux/cc_platform.h>
  #include <linux/export.h>
  #include <linux/highmem.h>
 -#include <linux/cc_platform.h>
+ #include <linux/ioport.h>
 +#include <linux/iosys-map.h>
  #include <xen/xen.h>
  
  #include <drm/drm_cache.h>

Re: linux-next: manual merge of the folio tree with the drm-intel tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]

Hi all,

On Tue, 22 Feb 2022 00:41:47 +0000 broonie@kernel.org wrote:
> 
> Today's linux-next merge of the folio tree got a conflict in:
> 
>   drivers/gpu/drm/drm_cache.c
> 
> between commit:
> 
>   7938f4218168a ("dma-buf-map: Rename to iosys-map")
> 
> from the drm-intel tree and commit:
> 
>   96160c2f78bd1 ("mm: don't include <linux/memremap.h> in <linux/mm.h>")
> 
> from the folio 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/drm_cache.c
> index 4b0da6baff78e,50b8a088f763a..0000000000000
> --- a/drivers/gpu/drm/drm_cache.c
> +++ b/drivers/gpu/drm/drm_cache.c
> @@@ -27,11 -27,11 +27,11 @@@
>   /*
>    * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
>    */
> - 
>  -#include <linux/dma-buf-map.h>
>  +#include <linux/cc_platform.h>
>   #include <linux/export.h>
>   #include <linux/highmem.h>
>  -#include <linux/cc_platform.h>
> + #include <linux/ioport.h>
>  +#include <linux/iosys-map.h>
>   #include <xen/xen.h>
>   
>   #include <drm/drm_cache.h>

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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]