From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 8 Apr 2015 21:26:21 +0000 (+0200)
Subject: Merge branch 'linus' into irq/core to get the GIC updates which
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=462b69b1e43ceccab68a47d65b1e46520cd0fdc0;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'linus' into irq/core to get the GIC updates which
conflict with pending GIC changes.

Conflicts:
	drivers/usb/isp1760/isp1760-core.c
---

462b69b1e43ceccab68a47d65b1e46520cd0fdc0
diff --cc include/linux/interrupt.h
index 2cee1761c77d,2e88580194f0..150dde04cf4f
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@@ -55,7 -59,12 +57,11 @@@
   * IRQF_NO_THREAD - Interrupt cannot be threaded
   * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device
   *                resume time.
+  * IRQF_COND_SUSPEND - If the IRQ is shared with a NO_SUSPEND user, execute this
+  *                interrupt handler after suspending interrupts. For system
+  *                wakeup devices users need to implement wakeup detection in
+  *                their interrupt handlers.
   */
 -#define IRQF_DISABLED		0x00000020
  #define IRQF_SHARED		0x00000080
  #define IRQF_PROBE_SHARED	0x00000100
  #define __IRQF_TIMER		0x00000200