Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes

The merge of the 'clk-for-linus' branch caused an automated
merge failure. Pull that in here so we can fix the problem.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 5 insertions, 2 deletions

diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index 5a37eadb4e56..ba2c611154af 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -496,9 +496,12 @@ static void crypto_netlink_rcv(struct sk_buff *skb)
 
 static int __init crypto_user_init(void)
 {
+        struct netlink_kernel_cfg cfg = {
+                .input  = crypto_netlink_rcv,
+        };
+
         crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO,
-                                            0, crypto_netlink_rcv,
-                                            NULL, THIS_MODULE);
+                                            THIS_MODULE, &cfg);
         if (!crypto_nlsk)
                 return -ENOMEM;