Re: Crypto Update for 4.20

[Linus Torvalds]

On Tue, Oct 23, 2018 at 3:10 AM Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote:
>
> Here is the crypto update for 4.20:

Pulled.

> Please note that there is a conflict with the compiler-attributes
> tree as one of the lines that was removed by a patch in the crypto
> tree was moved to a different file in the compiler-attributes tree.
> The fix is to remove that line from the moved file.

Thanks for noting that. I haven't pulled the compiler-attributes tree
yet, but I will hopefully remember this note when I do.

The lib80211 conflicts looked trivial, but I'm building the tree to
verify that I didn't screw something up..

               Linus