From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Feb 2023 20:49:29 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e534a583cc438ec2e9a7dc534c9d80d14b440718;p=linux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mattst88/alpha

Pull alpha updates from Al Viro:
 "Mostly small janitorial fixes but there's also more important ones: a
  patch to fix loading large modules from Edward Humes, and some fixes
  from Al Viro"

[ The fixes from Al mostly came in separately through Al's trees too and
  are now duplicated..   - Linus ]

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: in_irq() cleanup
  alpha: lazy FPU switching
  alpha/boot/misc: trim unused declarations
  alpha/boot/tools/objstrip: fix the check for ELF header
  alpha/boot: fix the breakage from -isystem series...
  alpha: fix FEN fault handling
  alpha: Avoid comma separated statements
  alpha: fixed a typo in core_cia.c
  alpha: remove unused __SLOW_DOWN_IO and SLOW_DOWN_IO definitions
  alpha: update config files
  alpha: fix R_ALPHA_LITERAL reloc for large modules
  alpha: Add some spaces to ensure format specification
  alpha: replace NR_SYSCALLS by NR_syscalls
  alpha: Remove redundant local asm header redirections
  alpha: Implement "current_stack_pointer"
  alpha: remove redundant err variable
  alpha: osf_sys: reduce kernel log spamming on invalid osf_mount call typenr
---

e534a583cc438ec2e9a7dc534c9d80d14b440718
diff --cc arch/alpha/include/asm/Kbuild
index 54f5126628c67,a8e769049fb42..dd31e97edae8e
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@@ -1,7 -1,7 +1,8 @@@
  # SPDX-License-Identifier: GPL-2.0
  
  generated-y += syscall_table.h
 +generic-y += agp.h
+ generic-y += asm-offsets.h
  generic-y += export.h
  generic-y += kvm_para.h
  generic-y += mcs_spinlock.h