From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 15 Jun 2017 04:02:40 +0000 (+0800)
Subject:  Merge tag 'v4.4.72' into linux-linaro-lsk-v4.4
X-Git-Tag: release-20171130_firefly~4^2~100^2~1^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e91e57d305c5b655c672e63eaed6b762d7fa21b5;p=firefly-linux-kernel-4.4.55.git

 Merge tag 'v4.4.72' into linux-linaro-lsk-v4.4

 This is the 4.4.72 stable release
---

e91e57d305c5b655c672e63eaed6b762d7fa21b5
diff --cc arch/arm64/kernel/entry.S
index a096d0980ade,dccd0c2e9023..6f69650c8b7b
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@@ -27,9 -27,9 +27,10 @@@
  #include <asm/cpufeature.h>
  #include <asm/errno.h>
  #include <asm/esr.h>
 +#include <asm/irq.h>
  #include <asm/memory.h>
  #include <asm/thread_info.h>
+ #include <asm/asm-uaccess.h>
  #include <asm/unistd.h>
  
  /*