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

 This is the 4.4.12 stable release

diff --cc arch/arm64/include/asm/pgtable-hwdef.h
Simple merge

diff --cc arch/arm64/include/asm/pgtable.h
index c3c2518eecfe29c41ea9f05ba814036d9fa2f0cc,67c2ad6d33b7b91914ef56af3ca04f67ffb1b48c..9a09ccf7122dc529c5e508b341f268596b614501
--- 1/arch/arm64/include/asm/pgtable.h
--- 2/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@@ -354,10 -354,9 +355,10 @@@ void pmdp_splitting_flush(struct vm_are
  #define pmd_mksplitting(pmd)  pte_pmd(pte_mkspecial(pmd_pte(pmd)))
  #define pmd_mkold(pmd)                pte_pmd(pte_mkold(pmd_pte(pmd)))
  #define pmd_mkwrite(pmd)      pte_pmd(pte_mkwrite(pmd_pte(pmd)))
 +#define pmd_mkclean(pmd)       pte_pmd(pte_mkclean(pmd_pte(pmd)))
  #define pmd_mkdirty(pmd)      pte_pmd(pte_mkdirty(pmd_pte(pmd)))
  #define pmd_mkyoung(pmd)      pte_pmd(pte_mkyoung(pmd_pte(pmd)))
- #define pmd_mknotpresent(pmd) (__pmd(pmd_val(pmd) & ~PMD_TYPE_MASK))
+ #define pmd_mknotpresent(pmd) (__pmd(pmd_val(pmd) & ~PMD_SECT_VALID))
  
  #define __HAVE_ARCH_PMD_WRITE
  #define pmd_write(pmd)                pte_write(pmd_pte(pmd))

diff --cc arch/arm64/kernel/cpuinfo.c
Simple merge

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

diff --cc kernel/events/core.c
Simple merge