From: Michael Ellerman Date: Wed, 2 Apr 2025 00:07:44 +0000 (+1100) Subject: Merge branch 'topic/cxl' into next X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=64f7efb0f536d4800f38df785f2b372f7ba8a405;p=users%2Fhch%2Fmisc.git Merge branch 'topic/cxl' into next This merges in the removal of the IBM CAPI "cxl" driver. --- 64f7efb0f536d4800f38df785f2b372f7ba8a405 diff --cc Documentation/userspace-api/ioctl/ioctl-number.rst index 3cf4183b767e,0b46257904d6..0ed32a70c346 --- a/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 0xB7 all uapi/linux/nsfs.h > 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 + 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: