Merge commit 'security-testing/next'

Conflicts:

	fs/cifs/cifs_fs_sb.h
	fs/nfsd/nfs4recover.c
	fs/ocfs2/namei.c

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/Makefile b/kernel/Makefile
index 010ccb311166..f25be175c021 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -9,7 +9,7 @@ obj-y     = sched.o fork.o exec_domain.o panic.o printk.o \
 	    rcupdate.o extable.o params.o posix-timers.o \
 	    kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
 	    hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
-	    notifier.o ksysfs.o pm_qos_params.o sched_clock.o
+	    notifier.o ksysfs.o pm_qos_params.o sched_clock.o cred.o
 
 ifdef CONFIG_FUNCTION_TRACER
 # Do not trace debug files and internal ftrace files