[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mips-cvs
Subject:    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
From:       linux-mips () linux-mips ! org
Date:       2016-06-04 10:39:09
Message-ID: S27042024AbcFDKjMC1Dtn/20160604103912Z+1487 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Sat Jun 4 10:17:52 2016 +0200
Commit: edae14c44e33143e5484f7582000455a3761c4cf
Gitweb: https://git.linux-mips.org/g/ralf/linux/edae14c44e33
Branch: master

---

 Documentation/arm64/silicon-errata.txt       |    1 +
 arch/arm/kernel/ptrace.c                     |    2 +
 arch/arm64/Kconfig                           |   21 +++++++++++
 arch/arm64/Kconfig.debug                     |   25 +++++++------
 arch/arm64/Makefile                          |    4 ++
 arch/arm64/include/asm/elf.h                 |    4 +-
 arch/arm64/include/asm/memory.h              |    3 +-
 arch/arm64/include/asm/page.h                |   12 +-----
 arch/arm64/include/asm/uaccess.h             |   13 -------
 arch/arm64/include/asm/unistd.h              |    2 +
 arch/arm64/include/asm/unistd32.h            |    8 ++++
 arch/arm64/kernel/cpuinfo.c                  |    8 ++++
 arch/arm64/kernel/traps.c                    |    5 ++-
 arch/arm64/mm/dump.c                         |    8 ++++
 arch/arm64/mm/hugetlbpage.c                  |   14 +++++++
 arch/powerpc/include/asm/reg.h               |    6 ++-
 arch/powerpc/kernel/prom_init.c              |    1 +
 arch/powerpc/mm/hash_utils_64.c              |   22 +++++++++++-
 arch/powerpc/mm/pgtable-book3s64.c           |    5 +--
 arch/powerpc/mm/pgtable-radix.c              |   23 +++++-------
 arch/powerpc/platforms/pseries/eeh_pseries.c |   49 ++++++++++++++++++--------
 drivers/irqchip/irq-gic-v3-its.c             |   49 +++++++++++++++++++++++++-
 drivers/irqchip/irq-gic-v3.c                 |    2 +
 drivers/irqchip/irq-pic32-evic.c             |    2 +
 drivers/perf/arm_pmu.c                       |   12 +++---
 include/linux/irqchip/arm-gic-v3.h           |    6 ++-
 include/linux/timekeeping.h                  |    3 ++
 kernel/irq/ipi.c                             |    2 +
 28 files changed, 214 insertions(+), 98 deletions(-)

[prev in list] [next in list] [prev in thread] [next in thread]