Hi Mark and Alex,

Please pull the GICv3 support to LSK based on v3.14. These are a prerequisite for KVM/ARM/arm64 support.

For the resolution of any conflicts, see my example merge of these branches here: http://git.linaro.org/git-ro/people/christoffer.dall/linux-kvm-arm.git lsk/lsk-with-kvm-v3.14

The following changes since commit b139b911b8eddbe30a4c116568a2f38f98af0a83:

arm64: add support for reserved memory defined by device tree (2014-09-13 10:26:57 -0700)

are available in the git repository at:

http://git.linaro.org/git-ro/people/christoffer.dall/linux-kvm-arm.git gic-v3-for-lsk-v3.14-v1

for you to fetch changes up to 8cbfd57948a16fe813e72e6b0ccb36b6417a78d8:

arm64: gicv3: Allow GICv3 compilation with older binutils (2014-10-02 20:50:54 +0200)

---------------------------------------------------------------- GICv3 Support for LSK v3.14

---------------------------------------------------------------- Catalin Marinas (1): arm64: gicv3: Allow GICv3 compilation with older binutils

Christoffer Dall (1): irqchip: Remove asmlinkage from static functions

Haojian Zhuang (1): irqchip: gic: Use mask field in GICC_IAR

Marc Zyngier (2): irqchip: gic: Move some bits of GICv2 to a library-type file irqchip: gic-v3: Initial support for GICv3

Matthias Brugger (1): irqchip: gic: Add support for cortex a7 compatible string

Sergei Shtylyov (1): irq-gic: remove file name from heading comment

Sricharan R (1): DRIVERS: IRQCHIP: IRQ-GIC: Add support for routable irqs

Stephen Boyd (1): irqchip: gic: Silence sparse warnings

Suravee Suthikulpanit (1): irqchip: gic: Add binding probe for ARM GIC400

Tomasz Figa (1): irqchip: gic: Fix core ID calculation when topology is read from DT

Will Deacon (1): irqchip: gic: use dmb ishst instead of dsb when raising a softirq

Documentation/devicetree/bindings/arm/gic.txt | 6 + arch/arm64/Kconfig | 1 + arch/arm64/include/asm/sysreg.h | 60 +++ arch/arm64/kernel/head.S | 18 + arch/arm64/kernel/hyp-stub.S | 1 + drivers/irqchip/Kconfig | 5 + drivers/irqchip/Makefile | 3 +- drivers/irqchip/irq-gic-common.c | 115 +++++ drivers/irqchip/irq-gic-common.h | 29 ++ drivers/irqchip/irq-gic-v3.c | 692 ++++++++++++++++++++++++++ drivers/irqchip/irq-gic.c | 167 ++++--- include/linux/irqchip/arm-gic-v3.h | 200 ++++++++ include/linux/irqchip/arm-gic.h | 9 +- 13 files changed, 1228 insertions(+), 78 deletions(-) create mode 100644 arch/arm64/include/asm/sysreg.h create mode 100644 drivers/irqchip/irq-gic-common.c create mode 100644 drivers/irqchip/irq-gic-common.h create mode 100644 drivers/irqchip/irq-gic-v3.c create mode 100644 include/linux/irqchip/arm-gic-v3.h