From: Stephen Rothwell <sfr@canb.auug.org.au>
To: John Johansen <john.johansen@canonical.com>,
Eric Biggers <ebiggers@kernel.org>,
"Jason A. Donenfeld" <Jason@zx2c4.com>,
Ard Biesheuvel <ardb@kernel.org>
Cc: Linux Crypto List <linux-crypto@vger.kernel.org>,
Eric Biggers <ebiggers@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the apparmor tree with the libcrypto tree
Date: Fri, 4 Jul 2025 15:36:30 +1000 [thread overview]
Message-ID: <20250704153630.0fb1e2f3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
Hi all,
Today's linux-next merge of the apparmor tree got a conflict in:
security/apparmor/crypto.c
between commit:
ad7ca74e1c60 ("apparmor: use SHA-256 library API instead of crypto_shash API")
from the libcrypto tree and commit:
e9ed1eb8f621 ("apparmor: use SHA-256 library API instead of crypto_shash API")
from the apparmor tree.
I fixed it up (I used the former version since it appears to be much
newer) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-07-04 5:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-04 5:36 Stephen Rothwell [this message]
2025-07-04 6:04 ` linux-next: manual merge of the apparmor tree with the libcrypto tree Eric Biggers
2025-07-04 20:14 ` John Johansen
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=20250704153630.0fb1e2f3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Jason@zx2c4.com \
--cc=ardb@kernel.org \
--cc=ebiggers@google.com \
--cc=ebiggers@kernel.org \
--cc=john.johansen@canonical.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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