Subject: linux-next: manual merge of the akpm-current tree with the net-next tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 13 Jul 2020 18:20:23 +1000

Hi all,

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

  mm/cma.h

between commit:

  a2b992c828f7 ("debugfs: make sure we can remove u32_array files cleanly")

from the net-next tree and commit:

  bc7212aceef6 ("mm: cma: fix the name of CMA areas")

from the akpm-current 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.

-- 
Cheers,
Stephen Rothwell

diff --cc mm/cma.h
index 6698fa63279b,27d3f0e9f68f..000000000000
--- a/mm/cma.h
+++ b/mm/cma.h
@@@ -2,8 -2,8 +2,10 @@@
  #ifndef __MM_CMA_H__
  #define __MM_CMA_H__
  
 +#include <linux/debugfs.h>
 +
+ #define CMA_MAX_NAME 64
+ 
  struct cma {
  	unsigned long   base_pfn;
  	unsigned long   count;
@@@ -13,9 -13,8 +15,9 @@@
  #ifdef CONFIG_CMA_DEBUGFS
  	struct hlist_head mem_head;
  	spinlock_t mem_head_lock;
 +	struct debugfs_u32_array dfs_bitmap;
  #endif
- 	const char *name;
+ 	char name[CMA_MAX_NAME];
  };
  
  extern struct cma cma_areas[MAX_CMA_AREAS];