From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Nick Terrell <terrelln@fb•com>, David Sterba <dsterba@suse•cz>
Cc: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Ingo Molnar <mingo@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nick Terrell <terrelln@meta•com>
Subject: Re: linux-next: manual merge of the tip tree with the btrfs, zstd trees
Date: Wed, 26 Mar 2025 10:06:11 +1100 [thread overview]
Message-ID: <20250326100611.551fcf61@canb.auug.org.au> (raw)
In-Reply-To: <20250324163417.4b9e84d4@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2025-03-25 23:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250326100611.551fcf61@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dsterba@suse$(echo .)cz \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=terrelln@fb$(echo .)com \
--cc=terrelln@meta$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox