Subject: linux-next: manual merge of the risc-v tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 18 Sep 2024 10:05:30 +1000

Hi all,

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

  tools/testing/selftests/riscv/mm/mmap_test.h

between commit:

  83dae72ac038 ("riscv: selftests: Remove mmap hint address checks")

from Linus' tree and commit:

  11c2dbd7f241 ("selftests: riscv: Allow mmap test to compile on 32-bit")

from the risc-v 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 tools/testing/selftests/riscv/mm/mmap_test.h
index 75918d15919f,1c3313c201d5..000000000000
--- a/tools/testing/selftests/riscv/mm/mmap_test.h
+++ b/tools/testing/selftests/riscv/mm/mmap_test.h
@@@ -13,6 -13,75 +13,8 @@@
  #define PROT (PROT_READ | PROT_WRITE)
  #define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS)
  
 -// Only works on 64 bit
 -#if __riscv_xlen == 64
 -/* mmap must return a value that doesn't use more bits than the hint address. */
 -static inline unsigned long get_max_value(unsigned long input)
 -{
 -	unsigned long max_bit = (1UL << (((sizeof(unsigned long) * 8) - 1 -
 -					  __builtin_clzl(input))));
 -
 -	return max_bit + (max_bit - 1);
 -}
 -
 -#define TEST_MMAPS                                                            \
 -	({                                                                    \
 -		void *mmap_addr;                                              \
 -		for (int i = 0; i < ARRAY_SIZE(random_addresses); i++) {      \
 -			mmap_addr = mmap((void *)random_addresses[i],         \
 -					 5 * sizeof(int), PROT, FLAGS, 0, 0); \
 -			EXPECT_NE(MAP_FAILED, mmap_addr);                     \
 -			EXPECT_GE((void *)get_max_value(random_addresses[i]), \
 -				  mmap_addr);                                 \
 -			mmap_addr = mmap((void *)random_addresses[i],         \
 -					 5 * sizeof(int), PROT, FLAGS, 0, 0); \
 -			EXPECT_NE(MAP_FAILED, mmap_addr);                     \
 -			EXPECT_GE((void *)get_max_value(random_addresses[i]), \
 -				  mmap_addr);                                 \
 -		}                                                             \
 -	})
 -#endif /* __riscv_xlen == 64 */
 -
+ #define TEST_MMAPS do { } while (0)
+ 
  static inline int memory_layout(void)
  {
  	void *value1 = mmap(NULL, sizeof(int), PROT, FLAGS, 0, 0);