From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2025 23:01:52 +0000 (+0900)
Subject: Merge tag 'alpha-for-v6.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.19-rc1~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c179cac051943f673c8baa53214e2566bfe69dc;p=thirdparty%2Flinux.git

Merge tag 'alpha-for-v6.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/lindholm/alpha

Pull alpha updates from Magnus Lindholm:
 "Two small uapi fixes. One patch hardcodes TC* ioctl values that
  previously depended on the deprecated termio struct, avoiding build
  issues with newer glibc versions. The other patch switches uapi
  headers to use the compiler-defined __ASSEMBLER__ macro for better
  consistency between kernel and userspace.

    - don't reference obsolete termio struct for TC* constants

    - Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers"

* tag 'alpha-for-v6.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/lindholm/alpha:
  alpha: don't reference obsolete termio struct for TC* constants
  alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers
---

5c179cac051943f673c8baa53214e2566bfe69dc