diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-02 22:35:49 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-02 22:35:49 +0300 |
| commit | 0a87d6bb6fd274cde3bf217a821153714374198f (patch) | |
| tree | e39aa8be37fbc72bc601ac2d6724dae086d26a04 /Documentation/userspace-api/ioctl | |
| parent | 8a6b94032e0077ae15b21e7b42a9599bdc18ea22 (diff) | |
| parent | 892c4e465c360d07f529bc3668fde7cbd4ea6b32 (diff) | |
| download | linux-0a87d6bb6fd274cde3bf217a821153714374198f.tar.xz | |
Merge tag 'powerpc-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull more powerpc updates from Michael Ellerman:
- Remove the IBM CAPI (cxl) driver
Thanks to Andrew Donnellan.
* tag 'powerpc-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
docs: Fix references to IBM CAPI (cxl) removal version
cxl: Remove driver
Diffstat (limited to 'Documentation/userspace-api/ioctl')
| -rw-r--r-- | Documentation/userspace-api/ioctl/ioctl-number.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index 3d1cd7ad9d67..7a1409ecc238 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -376,9 +376,9 @@ Code Seq# Include File Comments 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.15 0xCA 10-2F uapi/misc/ocxl.h -0xCA 80-BF uapi/scsi/cxlflash_ioctl.h Dead since 6.14 +0xCA 80-BF uapi/scsi/cxlflash_ioctl.h Dead since 6.15 0xCB 00-1F CBM serial IEC bus in development: <mailto:michael.klein@puffin.lb.shuttle.de> 0xCC 00-0F drivers/misc/ibmvmc.h pseries VMC driver |