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

This is the 4.9.174 stable release

 Conflicts:
	arch/arm64/include/asm/system_misc.h
	arch/arm64/mm/fault.c

diff --cc Makefile
Simple merge

diff --cc arch/arm64/include/asm/system_misc.h
index 7f9f2eb,d0beefe..88d8739
--- 1/arch/arm64/include/asm/system_misc.h
--- 2/arch/arm64/include/asm/system_misc.h
+++ b/arch/arm64/include/asm/system_misc.h
@@@ -40,14 -40,7 +40,14 @@@ void hook_debug_fault_code(int nr, int 
                           int sig, int code, const char *name);
  
  struct mm_struct;
- extern void show_pte(struct mm_struct *mm, unsigned long addr);
 +#ifdef CONFIG_AMLOGIC_USER_FAULT
 +extern void show_all_pfn(struct task_struct *task, struct pt_regs *regs);
 +#else
 +static inline void show_all_pfn(struct task_struct *task, struct pt_regs *regs)
 +{
 +}
 +#endif /* CONFIG_AMLOGIC_USER_FAULT */
+ extern void show_pte(unsigned long addr);
  extern void __show_regs(struct pt_regs *);
  
  extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);

diff --cc arch/arm64/mm/fault.c
Simple merge

diff --cc arch/arm64/mm/kasan_init.c
Simple merge

diff --cc arch/arm64/mm/proc.S
Simple merge

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

diff --cc drivers/usb/core/driver.c
Simple merge

diff --cc drivers/usb/core/message.c
Simple merge

diff --cc include/linux/kasan.h
Simple merge

diff --cc include/linux/usb.h
Simple merge

diff --cc lib/test_kasan.c
Simple merge

diff --cc mm/kasan/kasan.c
Simple merge

diff --cc mm/kasan/report.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc security/selinux/hooks.c
index 2cc3ce4,772df40..bc5222e
--- 1/security/selinux/hooks.c
--- 2/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -468,19 -467,12 +468,13 @@@ static int may_context_mount_inode_rela
        return rc;
  }
  
- static int selinux_is_sblabel_mnt(struct super_block *sb)
+ static int selinux_is_genfs_special_handling(struct super_block *sb)
  {
-       struct superblock_security_struct *sbsec = sb->s_security;
- 
-       return sbsec->behavior == SECURITY_FS_USE_XATTR ||
-               sbsec->behavior == SECURITY_FS_USE_TRANS ||
-               sbsec->behavior == SECURITY_FS_USE_TASK ||
-               sbsec->behavior == SECURITY_FS_USE_NATIVE ||
-               /* Special handling. Genfs but also in-core setxattr handler */
-               !strcmp(sb->s_type->name, "sysfs") ||
+       /* Special handling. Genfs but also in-core setxattr handler */
+       return  !strcmp(sb->s_type->name, "sysfs") ||
                !strcmp(sb->s_type->name, "pstore") ||
                !strcmp(sb->s_type->name, "debugfs") ||
 +              !strcmp(sb->s_type->name, "tracefs") ||
                !strcmp(sb->s_type->name, "rootfs");
  }