Merge tag 'v3.10.68' into linux-linaro-lsk

This is the 3.10.68 stable release

diff --cc arch/arm/include/asm/atomic.h
Simple merge

diff --cc arch/arm/include/asm/memory.h
Simple merge

diff --cc arch/arm/include/asm/pgtable-3level-hwdef.h
index f088c864c9926723f615feb125ddb3b207e50c21,add785b1ec0ab918f72d3c7e3eb90b56ff5a5baf..5d9f086e18cd17d3afbcbcbc3e471eaa07b21587
--- 1/arch/arm/include/asm/pgtable-3level-hwdef.h
--- 2/arch/arm/include/asm/pgtable-3level-hwdef.h
+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
@@@ -69,9 -66,9 +69,10 @@@
  #define PTE_TYPE_MASK         (_AT(pteval_t, 3) << 0)
  #define PTE_TYPE_FAULT                (_AT(pteval_t, 0) << 0)
  #define PTE_TYPE_PAGE         (_AT(pteval_t, 3) << 0)
 +#define PTE_TABLE_BIT         (_AT(pteval_t, 1) << 1)
  #define PTE_BUFFERABLE                (_AT(pteval_t, 1) << 2)         /* AttrIndx[0] */
  #define PTE_CACHEABLE         (_AT(pteval_t, 1) << 3)         /* AttrIndx[1] */
+ #define PTE_AP2                       (_AT(pteval_t, 1) << 7)         /* AP[2] */
  #define PTE_EXT_SHARED                (_AT(pteval_t, 3) << 8)         /* SH[1:0], inner shareable */
  #define PTE_EXT_AF            (_AT(pteval_t, 1) << 10)        /* Access Flag */
  #define PTE_EXT_NG            (_AT(pteval_t, 1) << 11)        /* nG */

diff --cc arch/arm/include/asm/pgtable-3level.h
index c5d94b31bde43757adf163cb346ab0610989a894,bb017328c5bde298ba9019a9360109d48549cb1f..0ea7f99f6d76141a2bc8259ecdd4c54284c91e6e
--- 1/arch/arm/include/asm/pgtable-3level.h
--- 2/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@@ -82,16 -74,11 +82,16 @@@
  #define L_PTE_SHARED          (_AT(pteval_t, 3) << 8)         /* SH[1:0], inner shareable */
  #define L_PTE_YOUNG           (_AT(pteval_t, 1) << 10)        /* AF */
  #define L_PTE_XN              (_AT(pteval_t, 1) << 54)        /* XN */
- #define L_PTE_DIRTY           (_AT(pteval_t, 1) << 55)        /* unused */
- #define L_PTE_SPECIAL         (_AT(pteval_t, 1) << 56)        /* unused */
+ #define L_PTE_DIRTY           (_AT(pteval_t, 1) << 55)
+ #define L_PTE_SPECIAL         (_AT(pteval_t, 1) << 56)
  #define L_PTE_NONE            (_AT(pteval_t, 1) << 57)        /* PROT_NONE */
+ #define L_PTE_RDONLY          (_AT(pteval_t, 1) << 58)        /* READ ONLY */
  
 +#define PMD_SECT_VALID                (_AT(pmdval_t, 1) << 0)
 +#define PMD_SECT_DIRTY                (_AT(pmdval_t, 1) << 55)
 +#define PMD_SECT_SPLITTING    (_AT(pmdval_t, 1) << 56)
 +#define PMD_SECT_NONE         (_AT(pmdval_t, 1) << 57)
 +
  /*
   * To be used in assembly code with the upper page attributes.
   */

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

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/kernel/module.c
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc drivers/firmware/efi/efi-pstore.c
Simple merge

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

diff --cc kernel/workqueue.c
Simple merge