Merge remote-tracking branch 'crypto/master'

diff --cc crypto/Kconfig
Simple merge

diff --cc drivers/crypto/nx/nx.c
Simple merge

diff --cc net/bluetooth/smp.c
index 5c17acfb16457af5db80b42cb89d691dccf9527b,21e445993f39c4e6ef2d208125f9a6020c9b2f48..372e3b25aaa4ce440056bb4faa68fd88253d6b28
--- 1/net/bluetooth/smp.c
--- 2/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@@ -1389,9 -1386,9 +1389,9 @@@ static struct smp_chan *smp_chan_create
                goto zfree_smp;
        }
  
-       smp->tfm_ecdh = crypto_alloc_kpp("ecdh", 0, 0);
+       smp->tfm_ecdh = crypto_alloc_kpp("ecdh-nist-p256", 0, 0);
        if (IS_ERR(smp->tfm_ecdh)) {
 -              BT_ERR("Unable to create ECDH crypto context");
 +              bt_dev_err(hcon->hdev, "Unable to create ECDH crypto context");
                goto free_shash;
        }
  
@@@ -3296,9 -3281,9 +3296,9 @@@ static struct l2cap_chan *smp_add_cid(s
                return ERR_CAST(tfm_cmac);
        }
  
-       tfm_ecdh = crypto_alloc_kpp("ecdh", 0, 0);
+       tfm_ecdh = crypto_alloc_kpp("ecdh-nist-p256", 0, 0);
        if (IS_ERR(tfm_ecdh)) {
 -              BT_ERR("Unable to create ECDH crypto context");
 +              bt_dev_err(hdev, "Unable to create ECDH crypto context");
                crypto_free_shash(tfm_cmac);
                kfree_sensitive(smp);
                return ERR_CAST(tfm_ecdh);