Subject: linux-next: manual merge of the kspp tree with the s390 tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 26 Aug 2025 17:44:01 +1000

Hi all,

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

  arch/s390/include/asm/bitops.h

between commits:

  de88e74889a3 ("s390/bitops: Slightly optimize ffs() and fls64()")
  669bc57e7016 ("s390/bitops: Optimize inlining")

from the s390 tree and commit:

  5f8ee21b8fb2 ("s390: Add __attribute_const__ to ffs()-family implementations")

from the kspp tree.

I fixed it up (Maybe - 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,

diff --cc arch/s390/include/asm/bitops.h
index 9dfb687ba620,fbcc3e1cc776..000000000000
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@@ -179,7 -179,7 +179,7 @@@ static __always_inline unsigned char __
   *
   * Undefined if no bit exists, so code should check against 0 first.
   */
- static __always_inline __flatten unsigned long __ffs(unsigned long word)
 -static inline __attribute_const__ unsigned long __ffs(unsigned long word)
++static __always_inline __flatten __attribute_const__ unsigned long __ffs(unsigned long word)
  {
  	return __flogr(-word & word) ^ (BITS_PER_LONG - 1);
  }
@@@ -191,11 -191,12 +191,11 @@@
   * This is defined the same way as the libc and
   * compiler builtin ffs routines (man ffs).
   */
- static __always_inline __flatten int ffs(int word)
 -static inline __attribute_const__ int ffs(int word)
++static __always_inline __flatten __attribute_const__ int ffs(int word)
  {
 -	unsigned long mask = 2 * BITS_PER_LONG - 1;
  	unsigned int val = (unsigned int)word;
  
 -	return (1 + (__flogr(-val & val) ^ (BITS_PER_LONG - 1))) & mask;
 +	return BITS_PER_LONG - __flogr(-val & val);
  }
  
  /**
@@@ -204,7 -205,7 +204,7 @@@
   *
   * Undefined if no set bit exists, so code should check against 0 first.
   */
- static __always_inline __flatten unsigned long __fls(unsigned long word)
 -static inline __attribute_const__ unsigned long __fls(unsigned long word)
++static __always_inline __flatten __attribute_const__ unsigned long __fls(unsigned long word)
  {
  	return __flogr(word) ^ (BITS_PER_LONG - 1);
  }
@@@ -220,9 -221,11 +220,9 @@@
   * set bit if value is nonzero. The last (most significant) bit is
   * at position 64.
   */
- static __always_inline __flatten int fls64(unsigned long word)
 -static inline __attribute_const__ int fls64(unsigned long word)
++static __always_inline __flatten __attribute_const__ int fls64(unsigned long word)
  {
 -	unsigned long mask = 2 * BITS_PER_LONG - 1;
 -
 -	return (1 + (__flogr(word) ^ (BITS_PER_LONG - 1))) & mask;
 +	return BITS_PER_LONG - __flogr(word);
  }
  
  /**
@@@ -232,7 -235,7 +232,7 @@@
   * This is defined the same way as ffs.
   * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
   */
- static __always_inline __flatten int fls(unsigned int word)
 -static inline __attribute_const__ int fls(unsigned int word)
++static __always_inline __flatten __attribute_const__ int fls(unsigned int word)
  {
  	return fls64(word);
  }
Stephen Rothwell