The following changes since commit e67572cd2204894179d89bd7b984072f19313b03: Linux 6.9-rc6 (2024-04-28 13:47:24 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic-6.10 for you to fetch changes up to e7cda7fe37ff1ece39bd2bf35ea68b1175395d95: bug: Improve comment (2024-05-07 14:20:48 +0200) ---------------------------------------------------------------- asm-generic cleanups for 6.10 These are a few cross-architecture cleanup patches: - Thomas Zimmermann works on separating fbdev support from the asm/video.h contents that may be used by either the old fbdev drivers or the newer drm display code. - Thorsten Blum contributes cleanups for the generic bitops code and asm-generic/bug.h - I remove the orphaned include/asm-generic/page.h header that used to included by long-removed mmu-less architectures. ---------------------------------------------------------------- Arnd Bergmann (1): asm-generic: remove unused asm-generic/page.h Thomas Zimmermann (3): arch: Select fbdev helpers with CONFIG_VIDEO arch: Remove struct fb_info from video helpers arch: Rename fbdev header and source files Thorsten Blum (2): bitops: Change function return types from long to int bug: Improve comment arch/arc/include/asm/fb.h | 8 --- arch/arm/include/asm/fb.h | 6 -- arch/arm64/include/asm/fb.h | 10 --- arch/loongarch/include/asm/{fb.h => video.h} | 8 +-- arch/m68k/include/asm/{fb.h => video.h} | 8 +-- arch/mips/include/asm/{fb.h => video.h} | 12 ++-- arch/parisc/Makefile | 2 +- arch/parisc/include/asm/fb.h | 14 ---- arch/parisc/include/asm/video.h | 16 +++++ arch/parisc/video/Makefile | 2 +- arch/parisc/video/{fbdev.c => video-sti.c} | 9 +-- arch/powerpc/include/asm/{fb.h => video.h} | 8 +-- arch/powerpc/kernel/pci-common.c | 2 +- arch/sh/include/asm/fb.h | 7 -- arch/sparc/Makefile | 4 +- arch/sparc/include/asm/{fb.h => video.h} | 15 ++-- arch/sparc/video/Makefile | 2 +- arch/sparc/video/fbdev.c | 26 ------- arch/sparc/video/video.c | 25 +++++++ arch/um/include/asm/Kbuild | 2 +- arch/x86/Makefile | 2 +- arch/x86/include/asm/fb.h | 19 ----- arch/x86/include/asm/video.h | 21 ++++++ arch/x86/video/Makefile | 3 +- arch/x86/video/{fbdev.c => video.c} | 21 +++--- drivers/video/fbdev/core/fbcon.c | 2 +- include/asm-generic/Kbuild | 2 +- include/asm-generic/bitops/__ffs.h | 4 +- include/asm-generic/bitops/__fls.h | 4 +- include/asm-generic/bitops/builtin-__ffs.h | 2 +- include/asm-generic/bitops/builtin-__fls.h | 2 +- include/asm-generic/bug.h | 2 +- include/asm-generic/page.h | 103 --------------------------- include/asm-generic/{fb.h => video.h} | 17 ++--- include/linux/bitops.h | 6 +- include/linux/fb.h | 2 +- tools/include/asm-generic/bitops/__ffs.h | 4 +- tools/include/asm-generic/bitops/__fls.h | 4 +- tools/include/linux/bitops.h | 2 +- 39 files changed, 139 insertions(+), 269 deletions(-) delete mode 100644 arch/arc/include/asm/fb.h delete mode 100644 arch/arm/include/asm/fb.h delete mode 100644 arch/arm64/include/asm/fb.h rename arch/loongarch/include/asm/{fb.h => video.h} (86%) rename arch/m68k/include/asm/{fb.h => video.h} (86%) rename arch/mips/include/asm/{fb.h => video.h} (76%) delete mode 100644 arch/parisc/include/asm/fb.h create mode 100644 arch/parisc/include/asm/video.h rename arch/parisc/video/{fbdev.c => video-sti.c} (78%) rename arch/powerpc/include/asm/{fb.h => video.h} (76%) delete mode 100644 arch/sh/include/asm/fb.h rename arch/sparc/include/asm/{fb.h => video.h} (75%) delete mode 100644 arch/sparc/video/fbdev.c create mode 100644 arch/sparc/video/video.c delete mode 100644 arch/x86/include/asm/fb.h create mode 100644 arch/x86/include/asm/video.h rename arch/x86/video/{fbdev.c => video.c} (66%) delete mode 100644 include/asm-generic/page.h rename include/asm-generic/{fb.h => video.h} (89%)