Subject: linux-next: manual merge of the tip tree with the mm tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 12 Jun 2024 11:27:46 +1000

Hi all,

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

  include/linux/cacheinfo.h

between commit:

  f6a9651bfd74 ("cpumask: make core headers including cpumask_types.h where possible")

from the mm-nonmm-unstable branch of the mm tree and commit:

  685cb1674060 ("cacheinfo: Add function to get cacheinfo for a given CPU and cache level")

from the tip 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 include/linux/cacheinfo.h
index 286db104e054,3dde175f4108..000000000000
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@@ -3,7 -3,8 +3,8 @@@
  #define _LINUX_CACHEINFO_H
  
  #include <linux/bitops.h>
+ #include <linux/cpuhplock.h>
 -#include <linux/cpumask.h>
 +#include <linux/cpumask_types.h>
  #include <linux/smp.h>
  
  struct device_node;