On Thu, Mar 16, 2017 at 12:22:00PM -0700, Linus Torvalds wrote:
> 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.
Yeah, your resolution makes sense.
Potentially we should just eject sha1dc from "pu" for the moment. It
needs re-rolled with the most recent version of the collision library
(and I see Marc just posted that they hit a stable point, which is
perhaps why you're looking at it).
I'd planned to work on that in the next few days, but if you want to do
so, be my guest.
-Peff