Merge tag 'asm-generic-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2024 17:56:28 +0000 (10:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2024 17:56:28 +0000 (10:56 -0700)
commit65d287c7eb1d14e0f4d56f19cec30d97fc7e8f66
tree2cd93443a61a1bfb581d90d7047f378eba5edc7b
parent3efa10eb97e98cca0c80b5b293a149eba8fb1d7e
parent5394f1e9b687bcf26595cabf83483e568676128d
Merge tag 'asm-generic-6.9' of git://git./linux/kernel/git/arnd/asm-generic

Pull asm-generic updates from Arnd Bergmann:
 "Just two small updates this time:

   - A series I did to unify the definition of PAGE_SIZE through
     Kconfig, intended to help with a vdso rework that needs the
     constant but cannot include the normal kernel headers when building
     the compat VDSO on arm64 and potentially others

   - a patch from Yan Zhao to remove the pfn_to_virt() definitions from
     a couple of architectures after finding they were both incorrect
     and entirely unused"

* tag 'asm-generic-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  arch: define CONFIG_PAGE_SIZE_*KB on all architectures
  arch: simplify architecture specific page size configuration
  arch: consolidate existing CONFIG_PAGE_SIZE_*KB definitions
  mm: Remove broken pfn_to_virt() on arch csky/hexagon/openrisc
arch/riscv/Kconfig
arch/s390/Kconfig
arch/x86/Kconfig