From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Oct 2017 16:31:15 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.14-rc8~40
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1960e8eabcba2749db9443adb2a5d93e4dabf590;p=users%2Fjedix%2Flinux-maple.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 an objtool regression"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/chacha20 - satisfy stack validation 2.0
---

1960e8eabcba2749db9443adb2a5d93e4dabf590