Merge remote-tracking branch 'tip/auto-latest'

diff --cc MAINTAINERS
Simple merge

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

diff --cc arch/s390/include/asm/pgtable.h
index 0eefb9e192d18898b48ef254df1008ff4480bf34,b820ff1db35e3240b4a4cce39cf9a3f8eec0c0e5..325a5d6ceabf8ca1bc0836d7674114d68863b9d1
--- 1/arch/s390/include/asm/pgtable.h
--- 2/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@@ -1258,17 -1240,31 +1258,30 @@@ static inline void set_pmd_at(struct mm
        *pmdp = entry;
  }
  
+ static inline pgprot_t pmd_pgprot(pmd_t pmd)
+ {
+       pgprot_t prot = PAGE_RW;
+ 
+       if (pmd_val(pmd) & _SEGMENT_ENTRY_RO) {
+               if (pmd_val(pmd) & _SEGMENT_ENTRY_INV)
+                       prot = PAGE_NONE;
+               else
+                       prot = PAGE_RO;
+       }
+       return prot;
+ }
+ 
  static inline unsigned long massage_pgprot_pmd(pgprot_t pgprot)
  {
 -      unsigned long pgprot_pmd = 0;
 -
 -      if (pgprot_val(pgprot) & _PAGE_INVALID) {
 -              if (pgprot_val(pgprot) & _PAGE_SWT)
 -                      pgprot_pmd |= _HPAGE_TYPE_NONE;
 -              pgprot_pmd |= _SEGMENT_ENTRY_INV;
 -      }
 -      if (pgprot_val(pgprot) & _PAGE_RO)
 -              pgprot_pmd |= _SEGMENT_ENTRY_RO;
 -      return pgprot_pmd;
 +      /*
 +       * pgprot is PAGE_NONE, PAGE_RO, or PAGE_RW (see __Pxxx / __Sxxx)
 +       * Convert to segment table entry format.
 +       */
 +      if (pgprot_val(pgprot) == pgprot_val(PAGE_NONE))
 +              return pgprot_val(SEGMENT_NONE);
 +      if (pgprot_val(pgprot) == pgprot_val(PAGE_RO))
 +              return pgprot_val(SEGMENT_RO);
 +      return pgprot_val(SEGMENT_RW);
  }
  
  static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

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

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

diff --cc kernel/time/tick-sched.c
Simple merge