Merge tag 'v4.9.166' into khadas-vim3-4.9.y

This is the 4.9.166 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm64/kernel/traps.c
index 5f2f085,28bef94..0f274f3
--- 1/arch/arm64/kernel/traps.c
--- 2/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@@ -295,16 -264,19 +295,18 @@@ static DEFINE_RAW_SPINLOCK(die_lock)
   */
  void die(const char *str, struct pt_regs *regs, int err)
  {
 -      struct thread_info *thread = current_thread_info();
        int ret;
+       unsigned long flags;
+ 
+       raw_spin_lock_irqsave(&die_lock, flags);
  
        oops_enter();
  
-       raw_spin_lock_irq(&die_lock);
        console_verbose();
        bust_spinlocks(1);
 -      ret = __die(str, err, thread, regs);
 +      ret = __die(str, err, regs);
  
 -      if (regs && kexec_should_crash(thread->task))
 +      if (regs && kexec_should_crash(current))
                crash_kexec(regs);
  
        bust_spinlocks(0);

diff --cc drivers/scsi/ufs/ufshcd.c
Simple merge

diff --cc fs/dcache.c
Simple merge