From: Will Deacon <will@kernel.org>
Date: Mon, 25 Jul 2022 09:56:31 +0000 (+0100)
Subject: Merge branch 'for-next/irqflags-nmi' into for-next/core
X-Git-Tag: v6.0-rc1~203^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=570365d365ddd28da2cf33b0cdfbe8c79ba67275;p=thirdparty%2Flinux.git

Merge branch 'for-next/irqflags-nmi' into for-next/core

* for-next/irqflags-nmi:
  arm64: select TRACE_IRQFLAGS_NMI_SUPPORT
  arch: make TRACE_IRQFLAGS_NMI_SUPPORT generic
---

570365d365ddd28da2cf33b0cdfbe8c79ba67275