tree 5c80c53b3bad9e2babd6ff4d303511f2e60b5cc7
parent 84bf39461e61f69ebfbfecf39cfda71bf78a7fc1
parent cb1eeb75cf3dd84ced81333967200583993dfd73
author Linus Torvalds <torvalds@linux-foundation.org> 1579112494 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1579112494 -0800

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a build problem for the hisilicon driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hisilicon/sec2 - Use atomics instead of __sync