Merge branch 'topic/cxl' into next

This merges in the removal of the IBM CAPI "cxl" driver.

diff --cc Documentation/userspace-api/ioctl/ioctl-number.rst
index 3cf4183b767e41195eebe808df9cfb871b31c511,0b46257904d6575c2eb4274e51612b4714936fee..0ed32a70c3460ed3ed010499866992f48b800b53
--- 1/Documentation/userspace-api/ioctl/ioctl-number.rst
--- 2/Documentation/userspace-api/ioctl/ioctl-number.rst
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
@@@ -372,10 -370,8 +372,10 @@@ Code  Seq#    Include Fil
  0xB7  all    uapi/linux/remoteproc_cdev.h                            <mailto:linux-remoteproc@vger.kernel.org>
  0xB7  all    uapi/linux/nsfs.h                                       <mailto:Andrei Vagin <avagin@openvz.org>>
  0xB8  01-02  uapi/misc/mrvl_cn10k_dpi.h                              Marvell CN10K DPI driver
 +0xB8  all    uapi/linux/mshv.h                                       Microsoft Hyper-V /dev/mshv driver
 +                                                                     <mailto:linux-hyperv@vger.kernel.org>
  0xC0  00-0F  linux/usb/iowarrior.h
- 0xCA  00-0F  uapi/misc/cxl.h
+ 0xCA  00-0F  uapi/misc/cxl.h                                         Dead since 6.14
  0xCA  10-2F  uapi/misc/ocxl.h
  0xCA  80-BF  uapi/scsi/cxlflash_ioctl.h                              Dead since 6.14
  0xCB  00-1F                                                          CBM serial IEC bus in development:

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/configs/skiroot_defconfig
Simple merge

diff --cc arch/powerpc/mm/book3s64/hash_utils.c
Simple merge

diff --cc arch/powerpc/mm/book3s64/pgtable.c
Simple merge