From: Arnd Bergmann Date: Wed, 3 Feb 2021 12:24:56 +0000 (+0100) Subject: Merge tag 'optee-fix-cond-resched-call-for-v5.12' of git://git.linaro.org:/people... X-Git-Tag: v5.12-rc1~194^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d94bd41a0022ca3e14479ed7b71cc5f79f159750;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'optee-fix-cond-resched-call-for-v5.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/drivers Remove unnecessary need_resched() before cond_resched() * tag 'optee-fix-cond-resched-call-for-v5.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee: tee: optee: remove need_resched() before cond_resched() tee: optee: replace might_sleep with cond_resched Link: https://lore.kernel.org/r/20210203120953.GB3624453@jade Signed-off-by: Arnd Bergmann --- d94bd41a0022ca3e14479ed7b71cc5f79f159750