From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Jan 2020 18:21:34 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.5-rc7~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0174cb6ce9449ce9b59cb9c6f4f64dc4df3de458;p=thirdparty%2Flinux.git

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
---

0174cb6ce9449ce9b59cb9c6f4f64dc4df3de458