From: Herbert Xu <herbert@gondor•apana.org.au>
To: Borislav Petkov <bp@alien8•de>
Cc: Mark Brown <broonie@kernel•org>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Ashish Kalra <ashish.kalra@amd•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the crypto tree
Date: Sat, 20 Sep 2025 09:17:20 +0800 [thread overview]
Message-ID: <aM4AoOSxD4SFo_Op@gondor.apana.org.au> (raw)
In-Reply-To: <20250919204355.GHaM3AiwTM25LiOKAb@fat_crate.local>
On Fri, Sep 19, 2025 at 10:43:55PM +0200, Borislav Petkov wrote:
>
> Pff, in hindsight those should probably all go through the crypto tree so that
> there's no unnecessary conflicts.
>
> Herbert, lemme know if I should undo them here and you take all three:
>
> 648dbccc03a0 crypto: ccp - Add AMD Seamless Firmware Servicing (SFS) driver
> e09701dcdd9c crypto: ccp - Add new HV-Fixed page allocation/free API
> e4c00c4ce2aa x86/sev: Add new dump_rmp parameter to snp_leak_pages() API
I think either way we will end up with conflicts. If I merge
them then we will get conflicts in x86/sev. If you merge them
then we get the conflicts in drivers/crypto.
As the conflicts seem to be straightforward, how about we just
keep things as it is and mention it to Linus when the merge window
opens?
Cheers,
--
Email: Herbert Xu <herbert@gondor•apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next prev parent reply other threads:[~2025-09-20 1:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-19 13:31 linux-next: manual merge of the tip tree with the crypto tree Mark Brown
2025-09-19 20:43 ` Borislav Petkov
2025-09-20 1:17 ` Herbert Xu [this message]
2025-09-20 10:01 ` Borislav Petkov
-- strict thread matches above, loose matches on Subject: below --
2026-01-07 2:07 Stephen Rothwell
2025-04-08 1:28 Stephen Rothwell
2025-04-08 6:35 ` Ingo Molnar
2022-11-28 1:29 Stephen Rothwell
2020-07-21 4:28 Stephen Rothwell
2020-08-03 22:14 ` Stephen Rothwell
2020-07-17 4:46 Stephen Rothwell
2020-07-17 6:27 ` Uros Bizjak
2020-07-17 6:44 ` Herbert Xu
2020-07-17 6:56 ` Stephen Rothwell
2020-07-17 7:31 ` Uros Bizjak
2020-07-20 4:03 ` Stephen Rothwell
2020-07-20 6:13 ` Uros Bizjak
2020-07-20 6:29 ` Stephen Rothwell
2020-07-20 11:59 ` Herbert Xu
2017-11-08 2:21 Stephen Rothwell
2015-10-12 3:24 Stephen Rothwell
2015-10-12 6:18 ` Herbert Xu
2015-06-17 3:21 Michael Ellerman
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=aM4AoOSxD4SFo_Op@gondor.apana.org.au \
--to=herbert@gondor$(echo .)apana.org.au \
--cc=ashish.kalra@amd$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=broonie@kernel$(echo .)org \
--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=peterz@infradead$(echo .)org \
--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