public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: John Johansen <john.johansen@canonical.com>,
	"Jason A. Donenfeld" <Jason@zx2c4.com>,
	Ard Biesheuvel <ardb@kernel.org>,
	Linux Crypto List <linux-crypto@vger.kernel.org>,
	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 apparmor tree with the libcrypto tree
Date: Thu, 3 Jul 2025 23:04:47 -0700	[thread overview]
Message-ID: <20250704060447.GC4199@sol> (raw)
In-Reply-To: <20250704153630.0fb1e2f3@canb.auug.org.au>

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

  reply	other threads:[~2025-07-04  6:05 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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=20250704060447.GC4199@sol \
    --to=ebiggers@kernel.org \
    --cc=Jason@zx2c4.com \
    --cc=ardb@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 \
    --cc=sfr@canb.auug.org.au \
    /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