Skip to contentSkip to conversation

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

PATCH [email protected] 2 participants 2 messages Feb 22, 2022 – Mar 24, 2022

Subsystems (3)
DRM drivers DRM misc Linux-next tree
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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.

drivers/gpu/drm/drm_cache.c +0 -0
diff --cc drivers/gpu/drm/drm_cache.c
index 4b0da6baff78e,50b8a088f763a..0000000000000
@@@ -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>
#1 lore raw

Hi all,

Quoted 31 lines · On Tue, 22 Feb 2022 00:41:47 +0000 [email protected] 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.

drivers/gpu/drm/drm_cache.c +0 -1
diff --cc drivers/gpu/drm/drm_cache.c
index 4b0da6baff78e,50b8a088f763a..0000000000000
@@@ -27,11 -27,11 +27,11 @@@
  /*
   * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
   */
-

drivers/gpu/drm/drm_cache.c

Quoted 10 lines
drivers/gpu/drm/drm_cache.c +1 -0
 -#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.

Signature · 2 lines
Cheers,
Stephen Rothwell