From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 03:23:17 +0000 (+1000)
Subject: Merge remote-tracking branch 'y2038/y2038'
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=c5b40edb5a16a15045d8296fce4849d8dcd73f67

Merge remote-tracking branch 'y2038/y2038'
---

c5b40edb5a16a15045d8296fce4849d8dcd73f67
diff --cc fs/afs/main.c
index 0b187ef3b5b7,129ff432391c..320290bfe643
--- a/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");