Subject: Re: [PATCH 4.4.y] crypto: vmx - Fix sleep-in-atomic bugs

From: Greg Kroah-Hartman <[email-masked]>
Date: Mon, 17 Sep 2018 13:47:15 +0200

On Mon, Sep 10, 2018 at 09:42:04AM +0200, Ondrej Mosnacek wrote:
> commit 0522236d4f9c5ab2e79889cb020d1acbe5da416e upstream.
> 
> Conflicts:
>   drivers/crypto/vmx/
>     aes_cbc.c - adapted enable/disable calls to v4.4 state
>     aes_xts.c - did not exist yet in v4.4

We don't need these lines here...  I'll go hand edit it out...