Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index 96ef51489e01..295e7fa56755 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -291,8 +291,7 @@ int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon)
         if (daemon->user_ns)
                 put_user_ns(daemon->user_ns);
         mutex_unlock(&daemon->mux);
-        memset(daemon, 0, sizeof(*daemon));
-        kfree(daemon);
+        kzfree(daemon);
 out:
         return rc;
 }