* linux-next: manual merge of the tip tree with the btrfs, zstd trees
@ 2025-03-24 5:34 Stephen Rothwell
2025-03-25 23:06 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-03-24 5:34 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Nick Terrell, David Sterba
Cc: Ingo Molnar, Linux Kernel Mailing List, Linux Next Mailing List,
Nick Terrell
[-- Attachment #1: Type: text/plain, Size: 1747 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
lib/zstd/common/portability_macros.h
between commit:
65d1f5507ed2 ("zstd: Import upstream v1.5.7")
from the btrfs, zstd trees and commit:
1400c87e6cac ("zstd: Increase DYNAMIC_BMI2 GCC version cutoff from 4.8 to 11.0 to work around compiler segfault")
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 lib/zstd/common/portability_macros.h
index 05286af72683,0dde8bf56595..000000000000
--- a/lib/zstd/common/portability_macros.h
+++ b/lib/zstd/common/portability_macros.h
@@@ -59,15 -53,15 +59,15 @@@
* Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default.
*/
#ifndef DYNAMIC_BMI2
- #if ((defined(__clang__) && __has_attribute(__target__)) \
+# if ((defined(__clang__) && __has_attribute(__target__)) \
|| (defined(__GNUC__) \
- && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))) \
+ && (__GNUC__ >= 11))) \
- && (defined(__x86_64__) || defined(_M_X64)) \
+ && (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_X64)) \
&& !defined(__BMI2__)
- # define DYNAMIC_BMI2 1
- #else
- # define DYNAMIC_BMI2 0
- #endif
+# define DYNAMIC_BMI2 1
+# else
+# define DYNAMIC_BMI2 0
+# endif
#endif
/*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the tip tree with the btrfs, zstd trees
2025-03-24 5:34 linux-next: manual merge of the tip tree with the btrfs, zstd trees Stephen Rothwell
@ 2025-03-25 23:06 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-03-25 23:06 UTC (permalink / raw)
To: Nick Terrell, David Sterba
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Ingo Molnar, Linux Kernel Mailing List, Linux Next Mailing List,
Nick Terrell
[-- Attachment #1: Type: text/plain, Size: 2017 bytes --]
Hi all,
On Mon, 24 Mar 2025 16:34:17 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> lib/zstd/common/portability_macros.h
>
> between commit:
>
> 65d1f5507ed2 ("zstd: Import upstream v1.5.7")
>
> from the btrfs, zstd trees and commit:
>
> 1400c87e6cac ("zstd: Increase DYNAMIC_BMI2 GCC version cutoff from 4.8 to 11.0 to work around compiler segfault")
>
> 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 lib/zstd/common/portability_macros.h
> index 05286af72683,0dde8bf56595..000000000000
> --- a/lib/zstd/common/portability_macros.h
> +++ b/lib/zstd/common/portability_macros.h
> @@@ -59,15 -53,15 +59,15 @@@
> * Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default.
> */
> #ifndef DYNAMIC_BMI2
> - #if ((defined(__clang__) && __has_attribute(__target__)) \
> +# if ((defined(__clang__) && __has_attribute(__target__)) \
> || (defined(__GNUC__) \
> - && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))) \
> + && (__GNUC__ >= 11))) \
> - && (defined(__x86_64__) || defined(_M_X64)) \
> + && (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_X64)) \
> && !defined(__BMI2__)
> - # define DYNAMIC_BMI2 1
> - #else
> - # define DYNAMIC_BMI2 0
> - #endif
> +# define DYNAMIC_BMI2 1
> +# else
> +# define DYNAMIC_BMI2 0
> +# endif
> #endif
>
> /*
The tip tree commit is now in Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-25 23:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-24 5:34 linux-next: manual merge of the tip tree with the btrfs, zstd trees Stephen Rothwell
2025-03-25 23:06 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox