From 322695d64f868da8d1091ea93c7c8f47bcc41220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ezequiel=20Rodriguez?= Date: Mon, 31 Aug 2026 11:31:24 -0300 Subject: [PATCH] docs: ioctl: fix stale NVMe registry entry and note N conflict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The NVMe row pointed at drivers/block/nvme.c, which no longer exists, and ioctl numbers 0x80-0x83 overlap between ntsync.h and nvme_ioctl.h without a conflict! marker. Signed-off-by: Iván Ezequiel Rodriguez Signed-off-by: Jonathan Corbet Message-ID: <20260831143125.151360-7-ivanrwcm25@gmail.com> --- Documentation/userspace-api/ioctl/ioctl-number.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index 32c0d08e92e4..35f495bc54f7 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -181,8 +181,9 @@ Code Seq# Include File Comments 'M' 01-03 drivers/scsi/megaraid/megaraid_sas.h 'M' 00-0F drivers/video/fsl-diu-fb.h conflict! 'N' 00-1F drivers/usb/scanner.h -'N' 40-7F drivers/block/nvme.c -'N' 80-8F uapi/linux/ntsync.h NT synchronization primitives +'N' 40-7F uapi/linux/nvme_ioctl.h +'N' 80-83 uapi/linux/ntsync.h and uapi/linux/nvme_ioctl.h conflict! +'N' 84-8F uapi/linux/ntsync.h NT synchronization primitives 'O' 00-06 mtd/ubi-user.h UBI 'P' all linux/soundcard.h conflict!