]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
projects / thirdparty / kernel / stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e129e47 a20b83c)
Merge tag 'nios2_update_for_v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2025 01:40:11 +0000 (18:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2025 01:40:11 +0000 (18:40 -0700)
Pull NIOS2 updates from Dinh Nguyen:

 - Replace __ASSEMBLY__ with __ASSEMBLER__ in headers

 - Set memblock.current_limit when setting pfn limits

* tag 'nios2_update_for_v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  nios2: ensure that memblock.current_limit is set when setting pfn limits
  nios2: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
  nios2: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers


Trivial merge
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git