linux-next: manual merge of the irqchip tree with the arm64 tree

2014-07-17 Thread Stephen Rothwell
Hi Jason, Today's linux-next merge of the irqchip tree got a conflict in arch/arm64/Kconfig between commit 875cbf3e4614 ("arm64: Add audit support") from the arm64 tree and commit 3e44358c12cc ("irqchip: gic: Add support for ARM GICv2m MSI(-X)") from the irqchip tree. I fixed it up (see below) an

linux-next: manual merge of the irqchip tree with the arm64 tree

2014-07-10 Thread Stephen Rothwell
Hi Jason, Today's linux-next merge of the irqchip tree got a conflict in arch/arm64/Kconfig between commit 875cbf3e4614 ("arm64: Add audit support") from the arm64 tree and commit 021f653791ad ("irqchip: gic-v3: Initial support for GICv3") from the irqchip tree. I fixed it up (see below) and can