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

diff --cc MAINTAINERS
index 9e026ac93b39a2304d2777907e11b9899e48d1a8,31c4b278ff55181adc46e9346afbe0ba8abcd7ef..53e1601aa88c4db95d24d968a8c802954589985b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2700,21 -2707,12 +2700,21 @@@ F:   include/linux/edac.
  
  EDAC-AMD64
  M:    Doug Thompson <dougthompson@xmission.com>
- M:    Borislav Petkov <borislav.petkov@amd.com>
+ M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
- S:    Supported
+ S:    Maintained
  F:    drivers/edac/amd64_edac*
  
 +EDAC-CAVIUM
 +M:    Ralf Baechle <ralf@linux-mips.org>
 +M:    David Daney <david.daney@cavium.com>
 +L:    linux-edac@vger.kernel.org
 +L:    linux-mips@linux-mips.org
 +W:    bluesmoke.sourceforge.net
 +S:    Supported
 +F:    drivers/edac/octeon_edac*
 +
  EDAC-E752X
  M:    Mark Gross <mark.gross@intel.com>
  M:    Doug Thompson <dougthompson@xmission.com>

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

diff --cc arch/s390/include/asm/pgtable.h
index 23d9a8af6f480a3047fa50228b827b931e625f28,098fc5a6bd5248f28dc77e6233706902f4475bbb..50c9f162a5760e0d0f5a2a91fe5fc4080c870ec4
--- 1/arch/s390/include/asm/pgtable.h
--- 2/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@@ -1257,17 -1240,31 +1257,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 arch/x86/kernel/acpi/boot.c
Simple merge

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

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

diff --cc drivers/edac/amd64_edac.h
Simple merge

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

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

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

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

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