Subject: linux-next: manual merge of the mm-stable tree with the dma-mapping-fixes tree

From: Mark Brown <[email-masked]>
Date: Wed, 28 Jan 2026 12:05:10 +0000

Hi all,

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

  include/linux/cma.h

between commit:

  26332ae848f08 ("of: reserved_mem: Allow reserved_mem framework detect "cma=" kernel param")

from the dma-mapping-fixes tree and commit:

  9bda131c6093e ("mm: cma: add cma_alloc_frozen{_compound}()")

from the mm-stable 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 include/linux/cma.h
index 48bbc78db4479,e2a690f7e77eb..0000000000000
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@@ -57,33 -62,4 +62,13 @@@ extern bool cma_intersects(struct cma *
  
  extern void cma_reserve_pages_on_error(struct cma *cma);
  
 +#ifdef CONFIG_DMA_CMA
 +extern bool cma_skip_dt_default_reserved_mem(void);
 +#else
 +static bool cma_skip_dt_default_reserved_mem(void)
 +{
 +	return false;
 +}
 +#endif
 +
- #ifdef CONFIG_CMA
- struct folio *cma_alloc_folio(struct cma *cma, int order, gfp_t gfp);
- bool cma_free_folio(struct cma *cma, const struct folio *folio);
- bool cma_validate_zones(struct cma *cma);
- #else
- static inline struct folio *cma_alloc_folio(struct cma *cma, int order, gfp_t gfp)
- {
- 	return NULL;
- }
- 
- static inline bool cma_free_folio(struct cma *cma, const struct folio *folio)
- {
- 	return false;
- }
- static inline bool cma_validate_zones(struct cma *cma)
- {
- 	return false;
- }
- #endif
- 
  #endif