Linus Torvalds <torva...@linux-foundation.org> writes:
> I think there's a semantic merge error and it clashes with
> f18f816cb158 ("hash.h: move SHA-1 implementation selection into a
> header file").
>
> Suggested possible merge resolution attached.
>
> Linus
Obviously I have not been paying much attention to the current shape
of that topic, awaiting the real thing X-<.
I am hoping that we can make the "hash.h" thing graduate soon to
'master' and then queue the real thing on top, but in the meantime I
should have made sure the current one still does the right thing.
Thanks.
