Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jul 2019 18:01:13 +0000 (11:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jul 2019 18:01:13 +0000 (11:01 -0700)
Pull irq updates from Thomas Gleixner:
 "The irq departement provides the usual mixed bag:

  Core:

   - Further improvements to the irq timings code which aims to predict
     the next interrupt for power state selection to achieve better
     latency/power balance

   - Add interrupt statistics to the core NMI handlers

   - The usual small fixes and cleanups

  Drivers:

   - Support for Renesas RZ/A1, Annapurna Labs FIC, Meson-G12A SoC and
     Amazon Gravition AMR/GIC interrupt controllers.

   - Rework of the Renesas INTC controller driver

   - ACPI support for Socionext SoCs

   - Enhancements to the CSKY interrupt controller

   - The usual small fixes and cleanups"

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)
  irq/irqdomain: Fix comment typo
  genirq: Update irq stats from NMI handlers
  irqchip/gic-pm: Remove PM_CLK dependency
  irqchip/al-fic: Introduce Amazon's Annapurna Labs Fabric Interrupt Controller Driver
  dt-bindings: interrupt-controller: Add Amazon's Annapurna Labs FIC
  softirq: Use __this_cpu_write() in takeover_tasklets()
  irqchip/mbigen: Stop printing kernel addresses
  irqchip/gic: Add dependency for ARM_GIC_MAX_NR
  genirq/affinity: Remove unused argument from [__]irq_build_affinity_masks()
  genirq/timings: Add selftest for next event computation
  genirq/timings: Add selftest for irqs circular buffer
  genirq/timings: Add selftest for circular array
  genirq/timings: Encapsulate storing function
  genirq/timings: Encapsulate timings push
  genirq/timings: Optimize the period detection speed
  genirq/timings: Fix timings buffer inspection
  genirq/timings: Fix next event index function
  irqchip/qcom: Use struct_size() in devm_kzalloc()
  irqchip/irq-csky-mpintc: Remove unnecessary loop in interrupt handler
  dt-bindings: interrupt-controller: Update csky mpintc
  ...

16 files changed:
1  2 
MAINTAINERS
drivers/acpi/irq.c
drivers/gpio/gpio-mb86s7x.c
drivers/irqchip/irq-csky-mpintc.c
drivers/irqchip/irq-gic-v2m.c
drivers/irqchip/irq-gic-v3.c
drivers/irqchip/irq-mbigen.c
drivers/irqchip/irq-meson-gpio.c
drivers/irqchip/irq-sni-exiu.c
drivers/irqchip/qcom-irq-combiner.c
include/linux/acpi.h
include/linux/irqchip/arm-gic-common.h
include/linux/irqchip/arm-gic.h
kernel/irq/irqdesc.c
kernel/softirq.c
lib/Kconfig.debug

diff --cc MAINTAINERS
index badf7e89b07291fe2917ddf764730754216cf309,f1fbe671abc2c8b4b469192d8d6dca794f8bf0a7..bcb37428522ac2f1dcbffb27983970a06557da04
@@@ -1306,8 -1304,14 +1306,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
  F:    drivers/irqchip/irq-vic.c
  
+ AMAZON ANNAPURNA LABS FIC DRIVER
+ M:    Talel Shenhar <talel@amazon.com>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
+ F:    drivers/irqchip/irq-al-fic.c
  ARM SMMU DRIVERS
 -M:    Will Deacon <will.deacon@arm.com>
 +M:    Will Deacon <will@kernel.org>
  R:    Robin Murphy <robin.murphy@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
Simple merge
index 9bfff171f9fef3c073f9bfda74d0025fe64cd4e1,64027f57a8aa3c54ea6fd61f2074163177d5dfa3..8f466993cd241cfbda0effba3b10efed3a991768
@@@ -4,8 -3,18 +4,9 @@@
   *
   *  Copyright (C) 2015 Fujitsu Semiconductor Limited
   *  Copyright (C) 2015 Linaro Ltd.
 - *
 - *  This program is free software: you can redistribute it and/or modify
 - *  it under the terms of the GNU General Public License as published by
 - *  the Free Software Foundation, version 2 of the License.
 - *
 - *  This program is distributed in the hope that it will be useful,
 - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - *  GNU General Public License for more details.
   */
  
+ #include <linux/acpi.h>
  #include <linux/io.h>
  #include <linux/init.h>
  #include <linux/clk.h>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge