Merge remote-tracking branch 'y2038/y2038'

diff --cc fs/afs/main.c
index 0b187ef3b5b7a2909b6e07c2dd4cd57d9569789b,129ff432391cf9f61a72543bcc246bb7c64770ca..320290bfe643a445b1b08378c9183ef37084c492
--- 1/fs/afs/main.c
--- 2/fs/afs/main.c
+++ b/fs/afs/main.c
@@@ -14,7 -14,7 +14,8 @@@
  #include <linux/init.h>
  #include <linux/completion.h>
  #include <linux/sched.h>
 +#include <linux/random.h>
+ #include <linux/ktime.h>
  #include "internal.h"
  
  MODULE_DESCRIPTION("AFS Client File System");