From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 9 Mar 2017 11:06:41 +0000 (+0100)
Subject: Merge tag 'irq-fixes-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz... 
X-Git-Tag: MMI-PSA29.97-13-9~5886^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=920c634aff6cb66e7f352668521eb1313897e93c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'irq-fixes-4.11-rc2' of git://git./linux/kernel/git/maz/arm-platforms into irq/urgent

Pull irqchip/irqdomain updates for 4.11-rc2 from Marc Zyngier

 - irqchip/crossbar: Some type tidying up
 - irqchip/gicv3-its: Workaround for a Qualcomm erratum
 - irqdomain: Compile for for systems that don't use CONFIG_IRQ_DOMAIN

Fixed up minor conflict in the crossbar driver.
---

920c634aff6cb66e7f352668521eb1313897e93c
diff --cc drivers/irqchip/irq-crossbar.c
index 05bbf171df37,1070b7b959f2..f96601268f71
--- a/drivers/irqchip/irq-crossbar.c
+++ b/drivers/irqchip/irq-crossbar.c
@@@ -198,8 -198,8 +198,8 @@@ static const struct irq_domain_ops cros
  
  static int __init crossbar_of_init(struct device_node *node)
  {
 -	int i, size, reserved = 0;
+ 	u32 max = 0, entry, reg_size;
 +	int i, size, reserved = 0;
- 	u32 max = 0, entry;
  	const __be32 *irqsr;
  	int ret = -ENOMEM;