Merge branch 'for-next/irqflags-nmi' into for-next/core
authorWill Deacon <will@kernel.org>
Mon, 25 Jul 2022 09:56:31 +0000 (10:56 +0100)
committerWill Deacon <will@kernel.org>
Mon, 25 Jul 2022 09:56:31 +0000 (10:56 +0100)
* for-next/irqflags-nmi:
  arm64: select TRACE_IRQFLAGS_NMI_SUPPORT
  arch: make TRACE_IRQFLAGS_NMI_SUPPORT generic

1  2 
arch/arm64/Kconfig

Simple merge