Received-SPF: pass (google.com: domain of linux-kernel+bounces-184204-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Feedback-ID: i56a14606:Fastmail
User-Agent: Cyrus-JMAP/3.11.0-alpha0-480-g515a2f54a-fm-20240515.001-g515a2f54
Precedence: bulk
MIME-Version: 1.0
Message-Id: <53adc3c6-9d79-405b-ae34-7a4c957a7bda@app.fastmail.com>
Date: Mon, 20 May 2024 21:50:04 +0000
From: "Arnd Bergmann" <arnd@arndb.de>
To: "Linus Torvalds" <torvalds@linux-foundation.org>
Cc: Linux-Arch <linux-arch@vger.kernel.org>, linux-kernel@vger.kernel.org,
 "Thomas Zimmermann" <tzimmermann@suse.de>,
 "Thorsten Blum" <thorsten.blum@toblux.com>
Subject: [GIT PULL v2] asm-generic cleanups for 6.10
Content-Type: text/plain

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 tags/asm-generic-6.10

for you to fetch changes up to 34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec:

  arch: Fix name collision with ACPI's video.o (2024-05-20 21:17:06 +0000)

----------------------------------------------------------------
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.

------------
I finally managed to resend this pull request after
merging another regression fix for the original
contents that were missing the tag on git.kernel.org
during my travels.

----------------------------------------------------------------
Arnd Bergmann (1):
      asm-generic: remove unused asm-generic/page.h

Thomas Zimmermann (4):
      arch: Select fbdev helpers with CONFIG_VIDEO
      arch: Remove struct fb_info from video helpers
      arch: Rename fbdev header and source files
      arch: Fix name collision with ACPI's video.o

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-common.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-common.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-common.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-common.c} (66%)
 delete mode 100644 include/asm-generic/page.h
 rename include/asm-generic/{fb.h => video.h} (89%)