Merge branch 'for-next/crypto' into for-next/core
authorWill Deacon <will@kernel.org>
Fri, 12 Feb 2021 14:54:55 +0000 (14:54 +0000)
committerWill Deacon <will@kernel.org>
Fri, 12 Feb 2021 14:54:55 +0000 (14:54 +0000)
commitf96a816fa5e5b7bdbfc1802dfb7f8155df2746d0
tree837f1f2cb1f866362770ebca1d94814253d3276b
parent88ddf0df1620c67c12f9a950cecf1dac99fb8e08
parentd13c613f136c9090f3863c49b2306d57ab59feba
Merge branch 'for-next/crypto' into for-next/core

Introduce a new macro to allow yielding the vector unit if preemption
is required. The initial users of this are being merged via the crypto
tree for 5.12.

* for-next/crypto:
  arm64: assembler: add cond_yield macro
arch/arm64/include/asm/assembler.h