* linux-next: manual merge of the kspp tree with the s390 tree
@ 2017-02-08 1:37 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2017-02-08 1:37 UTC (permalink / raw)
To: Kees Cook, Martin Schwidefsky, Heiko Carstens
Cc: linux-next, linux-kernel, Laura Abbott
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
arch/s390/Kconfig.debug
between commit:
89175cf76686 ("s390: provide sclp based boot console")
from the s390 tree and commit:
ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common")
from the kspp 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 arch/s390/Kconfig.debug
index 32b3e3bfd022,57f8ea9c49e3..000000000000
--- a/arch/s390/Kconfig.debug
+++ b/arch/s390/Kconfig.debug
@@@ -17,11 -17,4 +17,7 @@@ config S390_PTDUM
kernel.
If in doubt, say "N"
- config DEBUG_SET_MODULE_RONX
- def_bool y
- depends on MODULES
-
+config EARLY_PRINTK
+ def_bool y
+
endmenu
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the kspp tree with the s390 tree
@ 2025-08-26 7:44 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-08-26 7:44 UTC (permalink / raw)
To: Kees Cook, Heiko Carstens, Vasily Gorbik, Christian Borntraeger
Cc: Alexander Gordeev, Juergen Christ, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3336 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the kspp tree with the s390 tree
@ 2025-09-25 14:39 Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2025-09-25 14:39 UTC (permalink / raw)
To: Kees Cook
Cc: Alexander Gordeev, Heiko Carstens, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3487 bytes --]
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
arch/s390/include/asm/bitops.h
between commits:
de88e74889a30 ("s390/bitops: Slightly optimize ffs() and fls64()")
7b80a23c0e33a ("s390/bitops: Switch to generic fls(), fls64(), etc.")
6c4e0cb3d87ad ("s390/bitops: Switch to generic ffs() if supported by compiler")
from the s390 tree and commit:
b77fee88bfdfc ("s390: Add __attribute_const__ to ffs()-family implementations")
from the kspp 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 arch/s390/include/asm/bitops.h
index 1564dd3a5a826,fbcc3e1cc7769..0000000000000
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@@ -189,26 -191,58 +189,26 @@@ static __always_inline __attribute_cons
* 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);
}
-/**
- * __fls - find last (most-significant) set bit in a long word
- * @word: the word to search
- *
- * Undefined if no set bit exists, so code should check against 0 first.
- */
-static inline __attribute_const__ unsigned long __fls(unsigned long word)
-{
- return __flogr(word) ^ (BITS_PER_LONG - 1);
-}
+#else /* CONFIG_CC_HAS_BUILTIN_FFS */
-/**
- * fls64 - find last set bit in a 64-bit word
- * @word: the word to search
- *
- * This is defined in a similar way as the libc and compiler builtin
- * ffsll, but returns the position of the most significant set bit.
- *
- * fls64(value) returns 0 if value is 0 or the position of the last
- * set bit if value is nonzero. The last (most significant) bit is
- * at position 64.
- */
-static inline __attribute_const__ int fls64(unsigned long word)
-{
- unsigned long mask = 2 * BITS_PER_LONG - 1;
+#include <asm-generic/bitops/builtin-ffs.h>
- return (1 + (__flogr(word) ^ (BITS_PER_LONG - 1))) & mask;
-}
-
-/**
- * fls - find last (most-significant) bit set
- * @word: the word to search
- *
- * This is defined the same way as ffs.
- * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
- */
-static inline __attribute_const__ int fls(unsigned int word)
-{
- return fls64(word);
-}
+#endif /* CONFIG_CC_HAS_BUILTIN_FFS */
+#include <asm-generic/bitops/builtin-__ffs.h>
+#include <asm-generic/bitops/ffz.h>
+#include <asm-generic/bitops/builtin-__fls.h>
+#include <asm-generic/bitops/builtin-fls.h>
+#include <asm-generic/bitops/fls64.h>
#include <asm/arch_hweight.h>
#include <asm-generic/bitops/const_hweight.h>
-#include <asm-generic/bitops/ffz.h>
#include <asm-generic/bitops/sched.h>
#include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-atomic-setbit.h>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-25 14:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-25 14:39 linux-next: manual merge of the kspp tree with the s390 tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2025-08-26 7:44 Stephen Rothwell
2017-02-08 1:37 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox