lkml.org 
[lkml]   [2022]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tpmdd tree with the crypto tree
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@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

\
 
 \ /
  Last update: 2022-05-24 12:25    [W:0.038 / U:0.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site