-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi Linus,
Please pull the removal of the powerpc CAPI driver. This was a two patch series, the first patch went via the SCSI tree and the second patch had a conflict with the powerpc fixes branch. To avoid a messy conflict I put it in a topic branch and resolved the conflicts there. It's been in linux-next for a couple of weeks. cheers The following changes since commit 7b667acd69e316c2ed1b47e5dcd9d093be4a843f: Merge tag 'powerpc-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux (2025-03-27 19:39:08 -0700) are available in the git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git tags/powerpc-6.15-2 for you to fetch changes up to 892c4e465c360d07f529bc3668fde7cbd4ea6b32: docs: Fix references to IBM CAPI (cxl) removal version (2025-04-02 23:09:52 +1100) - - ------------------------------------------------------------------ powerpc updates for 6.15 #2 - Remove the IBM CAPI (cxl) driver Thanks to: Andrew Donnellan. - - ------------------------------------------------------------------ Andrew Donnellan (1): cxl: Remove driver Michael Ellerman (3): Merge branch 'fixes' into topic/cxl Merge branch 'topic/cxl' into next docs: Fix references to IBM CAPI (cxl) removal version Documentation/ABI/{obsolete => removed}/sysfs-class-cxl | 55 +- Documentation/arch/powerpc/cxl.rst | 470 ----- Documentation/arch/powerpc/index.rst | 1 - Documentation/userspace-api/ioctl/ioctl-number.rst | 4 +- MAINTAINERS | 12 - arch/powerpc/configs/skiroot_defconfig | 1 - arch/powerpc/include/asm/copro.h | 6 - arch/powerpc/include/asm/device.h | 3 - arch/powerpc/include/asm/pnv-pci.h | 17 - arch/powerpc/mm/book3s64/hash_native.c | 13 +- arch/powerpc/mm/book3s64/hash_utils.c | 10 +- arch/powerpc/mm/book3s64/pgtable.c | 1 - arch/powerpc/mm/book3s64/slice.c | 6 +- arch/powerpc/mm/copro_fault.c | 11 - arch/powerpc/platforms/powernv/Makefile | 1 - arch/powerpc/platforms/powernv/pci-cxl.c | 153 -- arch/powerpc/platforms/powernv/pci-ioda.c | 43 - arch/powerpc/platforms/powernv/pci.c | 61 - arch/powerpc/platforms/powernv/pci.h | 2 - drivers/misc/Kconfig | 1 - drivers/misc/Makefile | 1 - drivers/misc/cxl/Kconfig | 28 - drivers/misc/cxl/Makefile | 14 - drivers/misc/cxl/api.c | 532 ----- drivers/misc/cxl/base.c | 126 -- drivers/misc/cxl/context.c | 362 ---- drivers/misc/cxl/cxl.h | 1135 ----------- drivers/misc/cxl/cxllib.c | 271 --- drivers/misc/cxl/debugfs.c | 134 -- drivers/misc/cxl/fault.c | 341 ---- drivers/misc/cxl/file.c | 699 ------- drivers/misc/cxl/flash.c | 538 ----- drivers/misc/cxl/guest.c | 1208 ----------- drivers/misc/cxl/hcalls.c | 643 ------ drivers/misc/cxl/hcalls.h | 200 -- drivers/misc/cxl/irq.c | 450 ----- drivers/misc/cxl/main.c | 383 ---- drivers/misc/cxl/native.c | 1592 --------------- drivers/misc/cxl/of.c | 346 ---- drivers/misc/cxl/pci.c | 2103 -------------------- drivers/misc/cxl/sysfs.c | 771 ------- drivers/misc/cxl/trace.c | 9 - drivers/misc/cxl/trace.h | 691 ------- drivers/misc/cxl/vphb.c | 309 --- include/misc/cxl-base.h | 48 - include/misc/cxl.h | 265 --- include/misc/cxllib.h | 129 -- include/uapi/misc/cxl.h | 156 -- 48 files changed, 43 insertions(+), 14312 deletions(-) rename Documentation/ABI/{obsolete => removed}/sysfs-class-cxl (87%) delete mode 100644 Documentation/arch/powerpc/cxl.rst delete mode 100644 arch/powerpc/platforms/powernv/pci-cxl.c delete mode 100644 drivers/misc/cxl/Kconfig delete mode 100644 drivers/misc/cxl/Makefile delete mode 100644 drivers/misc/cxl/api.c delete mode 100644 drivers/misc/cxl/base.c delete mode 100644 drivers/misc/cxl/context.c delete mode 100644 drivers/misc/cxl/cxl.h delete mode 100644 drivers/misc/cxl/cxllib.c delete mode 100644 drivers/misc/cxl/debugfs.c delete mode 100644 drivers/misc/cxl/fault.c delete mode 100644 drivers/misc/cxl/file.c delete mode 100644 drivers/misc/cxl/flash.c delete mode 100644 drivers/misc/cxl/guest.c delete mode 100644 drivers/misc/cxl/hcalls.c delete mode 100644 drivers/misc/cxl/hcalls.h delete mode 100644 drivers/misc/cxl/irq.c delete mode 100644 drivers/misc/cxl/main.c delete mode 100644 drivers/misc/cxl/native.c delete mode 100644 drivers/misc/cxl/of.c delete mode 100644 drivers/misc/cxl/pci.c delete mode 100644 drivers/misc/cxl/sysfs.c delete mode 100644 drivers/misc/cxl/trace.c delete mode 100644 drivers/misc/cxl/trace.h delete mode 100644 drivers/misc/cxl/vphb.c delete mode 100644 include/misc/cxl-base.h delete mode 100644 include/misc/cxl.h delete mode 100644 include/misc/cxllib.h delete mode 100644 include/uapi/misc/cxl.h -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRjvi15rv0TSTaE+SIF0oADX8seIQUCZ+0tEgAKCRAF0oADX8se IcfuAQCG4FpG5hlZ01jIWq9cQmnhHYZbnvR7AkvI1TYlPpqbYQEAw1nGSOU6M30Q SM3visqeO9ZGUrmJhJfllHEBRpHJcAo= =aTSI -----END PGP SIGNATURE-----