diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-05-20 15:31:34 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-05-20 15:31:34 +0200 |
| commit | cd574ee16ffa2f2cad8414b9c59520e3e08a77f9 (patch) | |
| tree | 8511c7a250b9bd6f6b0285f7fdfb05cd917c0373 /crypto/crypto_user_base.c | |
| parent | 831fd9fdce82ad6727c15552b430c5e54420d92f (diff) | |
| parent | 8648646bd7927eccf4334248e94827d5dd47acf9 (diff) | |
| download | linux-crypto-cd574ee16ffa2f2cad8414b9c59520e3e08a77f9.tar.gz linux-crypto-cd574ee16ffa2f2cad8414b9c59520e3e08a77f9.zip | |
Merge tag 'v5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 5.2-rc1
Sync with upstream (which now contains fbdev-v5.2 changes) to
prepare a base for fbdev-v5.3 changes.
Diffstat (limited to 'crypto/crypto_user_base.c')
| -rw-r--r-- | crypto/crypto_user_base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/crypto_user_base.c b/crypto/crypto_user_base.c index f25d3f32..e48da3b7 100644 --- a/crypto/crypto_user_base.c +++ b/crypto/crypto_user_base.c @@ -465,8 +465,8 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, return err; } - err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, CRYPTOCFGA_MAX, - crypto_policy, extack); + err = nlmsg_parse_deprecated(nlh, crypto_msg_min[type], attrs, + CRYPTOCFGA_MAX, crypto_policy, extack); if (err < 0) return err; |