* linux-next: manual merge of the apparmor tree with the libcrypto tree
@ 2025-07-04 5:36 Stephen Rothwell
2025-07-04 6:04 ` Eric Biggers
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2025-07-04 5:36 UTC (permalink / raw)
To: John Johansen, Eric Biggers, Jason A. Donenfeld, Ard Biesheuvel
Cc: Linux Crypto List, Eric Biggers, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the apparmor tree with the libcrypto tree
2025-07-04 5:36 linux-next: manual merge of the apparmor tree with the libcrypto tree Stephen Rothwell
@ 2025-07-04 6:04 ` Eric Biggers
2025-07-04 20:14 ` John Johansen
0 siblings, 1 reply; 3+ messages in thread
From: Eric Biggers @ 2025-07-04 6:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: John Johansen, Jason A. Donenfeld, Ard Biesheuvel,
Linux Crypto List, Linux Kernel Mailing List,
Linux Next Mailing List
On Fri, Jul 04, 2025 at 03:36:30PM +1000, Stephen Rothwell wrote:
> 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.
Thanks Stephen. John, can you drop your version when you have a chance?
Thanks,
- Eric
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the apparmor tree with the libcrypto tree
2025-07-04 6:04 ` Eric Biggers
@ 2025-07-04 20:14 ` John Johansen
0 siblings, 0 replies; 3+ messages in thread
From: John Johansen @ 2025-07-04 20:14 UTC (permalink / raw)
To: Eric Biggers, Stephen Rothwell
Cc: Jason A. Donenfeld, Ard Biesheuvel, Linux Crypto List,
Linux Kernel Mailing List, Linux Next Mailing List
On 7/3/25 23:04, Eric Biggers wrote:
> On Fri, Jul 04, 2025 at 03:36:30PM +1000, Stephen Rothwell wrote:
>> 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.
>
> Thanks Stephen. John, can you drop your version when you have a chance?
>
Ooops, sorry. done
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-07-04 20:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-04 5:36 linux-next: manual merge of the apparmor tree with the libcrypto tree Stephen Rothwell
2025-07-04 6:04 ` Eric Biggers
2025-07-04 20:14 ` John Johansen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox