From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Aug 2025 04:35:03 +0000 (+0300)
Subject: Merge tag 'xtensa-20250808' of https://github.com/jcmvbkbc/linux-xtensa
X-Git-Tag: nvme-6.17-2025-09-04~48
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=09aae3ecf8f10c60e2ba43ee97f4d6364d8dd2fe;p=nvme.git

Merge tag 'xtensa-20250808' of https://github.com/jcmvbkbc/linux-xtensa

Pull xtensa update from Max Filippov:

 - replace __ASSEMBLY__ with __ASSEMBLER__ in arch headers

* tag 'xtensa-20250808' of https://github.com/jcmvbkbc/linux-xtensa:
  xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
  xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
---

09aae3ecf8f10c60e2ba43ee97f4d6364d8dd2fe