Re: linux-next: manual merge of the tpmdd tree with the crypto tree
From: Herbert Xu
Date: Tue May 24 2022 - 06:25:34 EST
On Mon, May 23, 2022 at 10:57:21PM +0300, Jarkko Sakkinen wrote:
>
> Herbert, so I pulled the whole patch set. How should we work out this?
Just send a note about the potential conflict to Linus when you
create the pull request. He'll sort it out.
Cheers,
--
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt