Add ioctl number entries for test_hmm_uapi and gup_test. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: David Hildenbrand Cc: Andrew Morton Cc: Jason Gunthorpe Cc: Leon Romanovsky Cc: linux-mm@kvack.org Documentation/userspace-api/ioctl/ioctl-number.rst | 4 ++++ 1 file changed, 4 insertions(+) --- linux-next-20261111.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261111/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -147,6 +147,8 @@ Code Seq# Include File 'G' 00-0F xen/gntalloc.h, xen/gntdev.h conflict! 'H' 00-7F linux/hiddev.h conflict! 'H' 00-0F linux/hidraw.h conflict! +'H' 00-0F lib/test_hmm_uapi.h conflict! + 'H' 01 linux/mei.h conflict! 'H' 02 linux/mei.h conflict! 'H' 03 linux/mei.h conflict! @@ -252,6 +254,8 @@ Code Seq# Include File 'f' 81-8F linux/fsverity.h 'g' 00-0F linux/usb/gadgetfs.h 'g' 20-2F linux/usb/g_printer.h +'g' 01-0F mm/gup_test.h conflict! + 'h' 00-7F conflict! Charon filesystem 'h' 00-1F linux/hpet.h conflict! Update the list of files where sound ioctls are defined and update the ranges of function numbers that are used. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: linux-sound@vger.kernel.org Documentation/userspace-api/ioctl/ioctl-number.rst | 12 +++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) --- linux-next-20261111.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261111/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -122,11 +122,14 @@ Code Seq# Include File 'A' 00-0F linux/agpgart.h, conflict! drivers/char/agp/compat_ioctl.h 'A' 00-7F sound/asound.h conflict! +'A' 20 sound/pcm.h conflict! +'A' 20-53 sound/core/pcm_compat.c conflict! 'B' 00-1F linux/cciss_ioctl.h conflict! 'B' 00-0F include/linux/pmu.h conflict! 'B' C0-FF advanced bbus 'B' 00-0F xen/xenbus_dev.h conflict! 'C' all linux/soundcard.h conflict! +'C' 00-68 sound/compress_offload.h conflict! 'C' 01-2F linux/capi.h conflict! 'C' F0-FF drivers/net/wan/cosa.h conflict! 'D' all arch/s390/include/asm/dasd.h @@ -152,6 +155,7 @@ Code Seq# Include File 'H' 01 linux/mei.h conflict! 'H' 02 linux/mei.h conflict! 'H' 03 linux/mei.h conflict! +'H' 03 sound/core/hwdep_compat.c conflict! 'H' 00-0F sound/asound.h conflict! 'H' 20-40 sound/asound_fm.h conflict! 'H' 80-8F sound/sfnt_info.h conflict! @@ -160,7 +164,9 @@ Code Seq# Include File 'H' 10-1F sound/hda_hwdep.h conflict! 'H' 40-4F sound/hdspm.h conflict! 'H' 40-4F sound/hdsp.h conflict! +'H' 60-63 sound/scarlett2.h 'H' 90 sound/usb/usx2y/usb_stream.h +'H' FC sound/pci/asihpi/hpios.h conflict! 'H' 00-0F uapi/misc/habanalabs.h conflict! 'H' A0 uapi/linux/usb/cdc-wdm.h 'H' C0-F0 net/bluetooth/hci.h conflict! @@ -168,7 +174,7 @@ Code Seq# Include File 'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict! 'H' C0-DF net/bluetooth/bnep/bnep.h conflict! 'H' F1 linux/hid-roccat.h -'H' F8-FA sound/firewire.h +'H' F8-FE sound/firewire.h conflict! 'I' all linux/isdn.h conflict! 'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! 'I' 40-4F linux/mISDNif.h conflict! @@ -204,6 +210,8 @@ Code Seq# Include File 'S' 80-81 scsi/scsi_ioctl.h conflict! 'S' 82-FF scsi/scsi.h conflict! 'S' 00-7F sound/asequencer.h conflict! +'S' 21-23 sound/core/seq/seq_compat.c conflict! +'S' 60-67 sound/fcp.h conflict! 'T' all linux/soundcard.h conflict! 'T' 00-AF sound/asound.h conflict! 'T' all arch/x86/include/asm/ioctls.h conflict! @@ -219,7 +227,7 @@ Code Seq# Include File 'V' C0 media/si4713.h conflict! 'W' 00-1F linux/watchdog.h conflict! 'W' 00-1F linux/wanrouter.h conflict! (pre 3.9) -'W' 00-3F sound/asound.h conflict! +'W' 00-41 sound/asound.h conflict! 'W' 40-5F drivers/pci/switch/switchtec.c 'W' 60-61 linux/watch_queue.h 'X' all fs/xfs/xfs_fs.h, conflict! Update the list of files where block ioctls are defined. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: Jens Axboe Cc: linux-block@vger.kernel.org Documentation/userspace-api/ioctl/ioctl-number.rst | 4 ++++ 1 file changed, 4 insertions(+) --- linux-next-20261111.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261111/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -78,6 +78,7 @@ Code Seq# Include File 0x00 00-1F linux/fb.h conflict! 0x00 00-1F linux/wavefront.h conflict! 0x02 all linux/fd.h + drivers/block/floppy.c 0x03 all linux/hdreg.h 0x04 D2-DC linux/umsdos_fs.h Dead since 2.6.11, but don't reuse these. 0x06 all linux/lp.h @@ -90,6 +91,9 @@ Code Seq# Include File linux/blkpg.h linux/blkzoned.h linux/blk-crypto.h + linux/blkdev.h + linux/blktrace_api.h + block/ioctl.c 0x15 all linux/fs.h FS_IOC_* ioctls 0x1b all InfiniBand Subsystem Update the list of files where networking ioctls are defined and update the ranges of function numbers that are used. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: Marcel Holtmann Cc: Luiz Augusto von Dentz Cc: linux-bluetooth@vger.kernel.org Cc: Willem de Bruijn Cc: Jason Wang Cc: David Heidelberg Cc: oe-linux-nfc@lists.linux.dev Cc: Chas Williams <3chas3@gmail.com> Cc: linux-atm-general@lists.sourceforge.net Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: netdev@vger.kernel.org Documentation/userspace-api/ioctl/ioctl-number.rst | 19 +++++++---- 1 file changed, 13 insertions(+), 6 deletions(-) --- linux-next-20261111.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261111/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -132,6 +132,7 @@ Code Seq# Include File 'B' 00-0F include/linux/pmu.h conflict! 'B' C0-FF advanced bbus 'B' 00-0F xen/xenbus_dev.h conflict! +'B' C8-D4 net/bluetooth/bnep/bnep.h 'C' all linux/soundcard.h conflict! 'C' 00-68 sound/compress_offload.h conflict! 'C' 01-2F linux/capi.h conflict! @@ -173,7 +174,7 @@ Code Seq# Include File 'H' FC sound/pci/asihpi/hpios.h conflict! 'H' 00-0F uapi/misc/habanalabs.h conflict! 'H' A0 uapi/linux/usb/cdc-wdm.h -'H' C0-F0 net/bluetooth/hci.h conflict! +'H' C0-F0 net/bluetooth/hci_sock.h conflict! 'H' C0-DF net/bluetooth/hidp/hidp.h conflict! 'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict! 'H' C0-DF net/bluetooth/bnep/bnep.h conflict! @@ -219,11 +220,12 @@ Code Seq# Include File 'T' all linux/soundcard.h conflict! 'T' 00-AF sound/asound.h conflict! 'T' all arch/x86/include/asm/ioctls.h conflict! -'T' C0-DF linux/if_tun.h conflict! +'T' C0-E3 linux/if_tun.h conflict! 'U' all sound/asound.h conflict! 'U' 00-CF linux/uinput.h conflict! 'U' 00-EF linux/usbdevice_fs.h 'U' C0-CF drivers/bluetooth/hci_uart.h +'U' 00 net/nfc/nci_core.h conflict! 'V' all linux/vt.h conflict! 'V' all linux/videodev2.h conflict! 'V' C0 linux/ivtvfb.h conflict! @@ -242,8 +244,8 @@ Code Seq# Include File 'Z' 14-15 drivers/message/fusion/mptctl.h '[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices -'a' all linux/atm*.h, linux/sonet.h ATM on linux - +'a' all linux/atm*.h, linux/sonet.h, linux/atmbr2684.h ATM on linux + linux/atmdev.h, net/atm/ioctl.c 'b' 00-FF conflict! bit3 vme host bridge 'b' 00-0F linux/dma-buf.h conflict! @@ -264,6 +266,7 @@ Code Seq# Include File 'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict! 'f' 13-27 linux/fscrypt.h 'f' 81-8F linux/fsverity.h +'f' 7b-7c arch/{alpha,mips,sh,xtensa}/include/uapi/asm/sockios.h 'g' 00-0F linux/usb/gadgetfs.h 'g' 20-2F linux/usb/g_printer.h 'g' 01-0F mm/gup_test.h conflict! @@ -308,8 +311,11 @@ Code Seq# Include File 'q' 80-FF linux/telephony.h Internet PhoneJACK, Internet LineJACK linux/ixjuser.h 'r' 00-1F linux/msdos_fs.h and fs/fat/dir.c -'s' all linux/cdk.h +'s' all linux/cdk.h conflict! +'s' 07-09 arch/{alpha,mips,sh,xtensa}/include/uapi/asm/sockios.h conflict! +'s' 64-65 arch/sh/include/uapi/asm/sockios.h conflict! 't' 00-7F linux/ppp-ioctl.h +'t' 46-4D drivers/net/ppp/ppp_generic.c 't' 80-8F linux/isdn_ppp.h 't' 90-91 linux/toshiba.h toshiba and toshiba_acpi SMM 'u' 00-1F linux/smb_fs.h gone @@ -334,7 +340,8 @@ Code Seq# Include File '|' 80-9F samples/ Any sample and example drivers 0x80 00-1F linux/fb.h 0x81 00-1F linux/vduse.h -0x89 00-06 arch/x86/include/asm/sockios.h +0x89 00-07 asm-generic/sockios.h +0x89 06-07 linux/sockios.h 0x89 0B-DF linux/sockios.h 0x89 E0-EF linux/sockios.h SIOCPROTOPRIVATE range 0x89 F0-FF linux/sockios.h SIOCDEVPRIVATE range Update the list of files where video or fbdev ioctls are defined and update the ranges of function numbers that are used. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: Helge Deller Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Documentation/userspace-api/ioctl/ioctl-number.rst | 14 +++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) --- linux-next-20261111.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261111/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -148,9 +148,13 @@ Code Seq# Include File 'F' 20 linux/ivtvfb.h conflict! 'F' 20 linux/matroxfb.h conflict! 'F' 20 drivers/video/aty/atyfb_base.c conflict! +'F' 20 arch/powerpc/include/uapi/asm/ps3fb.h conflict! +'F' 00-21 arch/m68k/include/asm/fbio.h conflict! +'F' 00-21 arch/sparc/include/asm/fbio.h conflict! 'F' 00-0F video/da8xx-fb.h conflict! 'F' 80-8F linux/arcfb.h conflict! 'F' DD video/sstfb.h conflict! +'G' 00-02 drivers/video/fbdev/pxa3xx-gcu.h conflict! 'G' 00-3F drivers/misc/sgi-gru/grulib.h conflict! 'G' 00-0F xen/gntalloc.h, xen/gntdev.h conflict! 'H' 00-7F linux/hiddev.h conflict! @@ -188,10 +192,13 @@ Code Seq# Include File 'L' 10-1F drivers/scsi/mpt3sas/mpt3sas_ctl.h conflict! 'L' E0-FF linux/ppdd.h encrypted disk device driver +'L' 35-38 arch/m68k/include/asm/fbio.h +'L' 35-38 arch/sparc/include/asm/fbio.h 'M' all linux/soundcard.h conflict! 'M' 01-16 mtd/mtd-abi.h conflict! and drivers/mtd/mtdchar.c 'M' 01-03 drivers/scsi/megaraid/megaraid_sas.h +'M' 00-03 drivers/video/fbdev/mb862xx/mb862xxfb.h 'M' 00-0F drivers/video/fsl-diu-fb.h conflict! 'N' 00-1F drivers/usb/scanner.h 'N' 40-7F uapi/linux/nvme_ioctl.h @@ -199,6 +206,7 @@ Code Seq# Include File 'N' 84-8F uapi/linux/ntsync.h NT synchronization primitives 'O' 00-06 mtd/ubi-user.h UBI +'O' 1F-3F linux/omapfb.h 'P' all linux/soundcard.h conflict! 'P' 60-6F sound/sscape_ioctl.h conflict! 'P' 00-0F drivers/usb/class/usblp.c conflict! @@ -295,6 +303,7 @@ Code Seq# Include File 'n' 00-7F linux/ncp_fs.h and fs/ncpfs/ioctl.c 'n' 80-8F uapi/linux/nilfs2_api.h NILFS2 'n' E0-FF linux/matroxfb.h matroxfb +'n' F8-FA video/sisfb.h sisfb 'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2 'o' 00-03 mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps) 'o' 40-41 mtd/ubi-user.h UBI @@ -311,6 +320,7 @@ Code Seq# Include File 'q' 80-FF linux/telephony.h Internet PhoneJACK, Internet LineJACK linux/ixjuser.h 'r' 00-1F linux/msdos_fs.h and fs/fat/dir.c +'r' 01-06 arch/powerpc/include/uapi/asm/ps3fb.h 's' all linux/cdk.h conflict! 's' 07-09 arch/{alpha,mips,sh,xtensa}/include/uapi/asm/sockios.h conflict! 's' 64-65 arch/sh/include/uapi/asm/sockios.h conflict! @@ -426,8 +436,8 @@ Code Seq# Include File 0xEC 00-01 linux/platform_data/cros_ec_chardev.h ChromeOS EC driver 0xEE 00-09 uapi/linux/pfrut.h Platform Firmware Runtime Update and Telemetry 0xEF 00-0F uapi/linux/ntfs.h NTFS -0xF3 00-3F drivers/usb/misc/sisusbvga/sisusb.h sisfb (in development) - +0xF3 00-3F drivers/usb/misc/sisusbvga/sisusb.h sisfb +0xF3 00-3F video/sisfb.h 0xF6 all LTTng Linux Trace Toolkit Next Generation 0xF8 all arch/x86/include/uapi/asm/amd_hsmp.h AMD HSMP EPYC system management interface driver Update the list of files where SCSI ioctls are defined and update the ranges of function numbers that are used. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: MPT-FusionLinux.pdl@broadcom.com Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org Documentation/userspace-api/ioctl/ioctl-number.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- linux-next-20261111.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261111/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -189,7 +189,7 @@ Code Seq# Include File 'I' 40-4F linux/mISDNif.h conflict! 'K' all linux/kd.h 'L' 00-1F linux/loop.h conflict! -'L' 10-1F drivers/scsi/mpt3sas/mpt3sas_ctl.h conflict! +'L' 10-21 drivers/scsi/mpt3sas/mpt3sas_ctl.h conflict! 'L' E0-FF linux/ppdd.h encrypted disk device driver 'L' 35-38 arch/m68k/include/asm/fbio.h @@ -260,6 +260,7 @@ Code Seq# Include File 'c' 00-7F linux/comstats.h conflict! 'c' 00-7F linux/coda.h conflict! 'c' 00-1F linux/chio.h conflict! +'c' 08 drivers/scsi/ch.c conflict! 'c' 80-9F arch/s390/include/asm/chsc.h conflict! 'c' A0-AF arch/x86/include/asm/msr.h conflict! 'd' 00-FF linux/char/drm/drm.h conflict! Update the list of files where MTD ioctls are defined and update the ranges of function numbers that are used. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: Miquel Raynal Cc: Richard Weinberger Cc: Vignesh Raghavendra Cc: Zhihao Cheng Cc: linux-mtd@lists.infradead.org Documentation/userspace-api/ioctl/ioctl-number.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- linux-next-20261111.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261111/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -195,8 +195,8 @@ Code Seq# Include File 'L' 35-38 arch/m68k/include/asm/fbio.h 'L' 35-38 arch/sparc/include/asm/fbio.h 'M' all linux/soundcard.h conflict! -'M' 01-16 mtd/mtd-abi.h conflict! - and drivers/mtd/mtdchar.c +'M' 01-1A mtd/mtd-abi.h conflict! +'M' 03-04 drivers/mtd/mtdchar.c 'M' 01-03 drivers/scsi/megaraid/megaraid_sas.h 'M' 00-03 drivers/video/fbdev/mb862xx/mb862xxfb.h 'M' 00-0F drivers/video/fsl-diu-fb.h conflict! @@ -306,7 +306,7 @@ Code Seq# Include File 'n' E0-FF linux/matroxfb.h matroxfb 'n' F8-FA video/sisfb.h sisfb 'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2 -'o' 00-03 mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps) +'o' 00-06 mtd/ubi-user.h conflict! (OCFS2 and UBI overlap) 'o' 40-41 mtd/ubi-user.h UBI 'o' 01-A1 `linux/dvb/*.h` DVB 'p' 00-0F linux/phantom.h conflict! (OpenHaptics needs this) Update the list of files where USB ioctls are defined. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: Neill Kapron Cc: Andrey Konovalov Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Documentation/userspace-api/ioctl/ioctl-number.rst | 6 ++++++ 1 file changed, 6 insertions(+) --- linux-next-20261111.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261111/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -234,6 +234,9 @@ Code Seq# Include File 'U' 00-EF linux/usbdevice_fs.h 'U' C0-CF drivers/bluetooth/hci_uart.h 'U' 00 net/nfc/nci_core.h conflict! +'U' 00-0F linux/usb/raw_gadget.h conflict! +'U' 01 linux/usb/g_uvc.h conflict! +'U' 64 drivers/usb/misc/usbtest.c conflict! 'V' all linux/vt.h conflict! 'V' all linux/videodev2.h conflict! 'V' C0 linux/ivtvfb.h conflict! @@ -280,6 +283,9 @@ Code Seq# Include File 'g' 20-2F linux/usb/g_printer.h 'g' 01-0F mm/gup_test.h conflict! +'g' 01-03 linux/usb/functionfs.h conflict! + 80-86 +'g' 41-42 linux/usb/g_hid.h 'h' 00-7F conflict! Charon filesystem 'h' 00-1F linux/hpet.h conflict! Update the list of files where virtualization ioctls are defined. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: Juergen Gross Cc: Stefano Stabellini Cc: xen-devel@lists.xenproject.org Cc: Hans de Goede Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Eugenio Pérez Cc: Sean Christopherson Cc: Paolo Bonzini Cc: kvm@vger.kernel.org Cc: virtualization@lists.linux.dev Documentation/userspace-api/ioctl/ioctl-number.rst | 6 ++++++ 1 file changed, 6 insertions(+) --- linux-next-20261113.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261113/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -200,6 +200,7 @@ Code Seq# Include File 'M' 01-03 drivers/scsi/megaraid/megaraid_sas.h 'M' 00-03 drivers/video/fbdev/mb862xx/mb862xxfb.h 'M' 00-0F drivers/video/fsl-diu-fb.h conflict! +'M' 01-03 xen/interface/xen-mca.h conflict! 'N' 00-1F drivers/usb/scanner.h 'N' 40-7F uapi/linux/nvme_ioctl.h 'N' 80-83 uapi/linux/ntsync.h and uapi/linux/nvme_ioctl.h conflict! @@ -239,6 +240,7 @@ Code Seq# Include File 'U' 64 drivers/usb/misc/usbtest.c conflict! 'V' all linux/vt.h conflict! 'V' all linux/videodev2.h conflict! +'V' 00-1F linux/vboxguest.h conflict! 'V' C0 linux/ivtvfb.h conflict! 'V' C0 linux/ivtv.h conflict! 'V' C0 media/si4713.h conflict! @@ -357,6 +359,7 @@ Code Seq# Include File '|' 80-9F samples/ Any sample and example drivers 0x80 00-1F linux/fb.h 0x81 00-1F linux/vduse.h + drivers/vdpa/vdpa_user/vduse_dev.c 0x89 00-07 asm-generic/sockios.h 0x89 06-07 linux/sockios.h 0x89 0B-DF linux/sockios.h @@ -398,8 +401,11 @@ Code Seq# Include File 0xAE 40-FF linux/kvm.h Kernel-based Virtual Machine +0xAE C6 arch/x86/kvm/x86.c X86 KVM 0xAE 20-3F linux/nitro_enclaves.h Nitro Enclaves 0xAF 00-1F linux/fsl_hypervisor.h Freescale hypervisor +0xAF 00-8F linux/vhost.h conflict! +0xAF 31-32 drivers/vhost/test.h conflict! 0xB0 all RATIO devices in development: 0xB1 00-1F PPPoX Update the list of files where filesystem ioctls are defined and update the ranges of function numbers that are used. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: Jan Kara Cc: linux-fsdevel@vger.kernel.org Cc: "Theodore Ts'o" Cc: linux-ext4@vger.kernel.org Cc: Mike Marshall Cc: devel@lists.orangefs.org Cc: Paulo Alcantara Cc: Namjae Jeon Cc: linux-cifs@vger.kernel.org Cc: Jaegeuk Kim Cc: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net Documentation/userspace-api/ioctl/ioctl-number.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- linux-next-20261113.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261113/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -187,6 +187,7 @@ Code Seq# Include File 'I' all linux/isdn.h conflict! 'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! 'I' 40-4F linux/mISDNif.h conflict! +'I' 00 linux/inotify.h 'K' all linux/kd.h 'L' 00-1F linux/loop.h conflict! 'L' 10-21 drivers/scsi/mpt3sas/mpt3sas_ctl.h conflict! @@ -275,7 +276,7 @@ Code Seq# Include File 'f' 00-1F linux/ext2_fs.h conflict! 'f' 00-1F linux/ext3_fs.h conflict! 'f' 00-0F fs/jfs/jfs_dinode.h conflict! -'f' 00-0F fs/ext4/ext4.h conflict! +'f' 00-2F fs/ext4/ext4.h conflict! 'f' 00-0F linux/fs.h conflict! 'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict! 'f' 13-27 linux/fscrypt.h @@ -300,6 +301,7 @@ Code Seq# Include File 'k' 00-0F linux/spi/spidev.h conflict! 'k' 00-05 video/kyro.h conflict! 'k' 10-17 linux/hsi/hsi_char.h HSI character device +'k' 01-0F fs/orangefs/protocol.h 'l' 00-3F linux/tcfs_fs.h transparent cryptographic file system 'l' 40-7F linux/udf_fs_i.h in development: @@ -373,7 +375,7 @@ Code Seq# Include File 0x92 00-0F drivers/usb/mon/mon_bin.c 0x93 60-7F linux/auto_fs.h 0x94 all fs/btrfs/ioctl.h Btrfs filesystem - and linux/fs.h some lifted to vfs/generic +0x94 all linux/fs.h some lifted from Btrfs to vfs/generic 0x97 00-7F fs/ceph/ioctl.h Ceph file system 0x99 00-0F 537-Addinboard driver @@ -442,7 +444,7 @@ Code Seq# Include File 0xCC 00-0F drivers/misc/ibmvmc.h pseries VMC driver 0xCD 01 linux/reiserfs_fs.h Dead since 6.13 0xCE 01-02 uapi/linux/cxl_mem.h Compute Express Link Memory Devices -0xCF 02 fs/smb/client/cifs_ioctl.h +0xCF 01-0F fs/smb/client/cifs_ioctl.h 0xDD 00-3F ZFCP device driver see drivers/s390/scsi/ 0xE5 00-3F linux/fuse.h @@ -451,6 +453,7 @@ Code Seq# Include File 0xEF 00-0F uapi/linux/ntfs.h NTFS 0xF3 00-3F drivers/usb/misc/sisusbvga/sisusb.h sisfb 0xF3 00-3F video/sisfb.h +0xF5 01-1F uapi/linux/f2fs.h 0xF6 all LTTng Linux Trace Toolkit Next Generation 0xF8 all arch/x86/include/uapi/asm/amd_hsmp.h AMD HSMP EPYC system management interface driver Update the list of platform/ files where ioctls are defined and update the ranges of function numbers that are used. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: Florian Fainelli Cc: Broadcom internal kernel review list Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: Tzung-Bi Shih Cc: Benson Leung Documentation/userspace-api/ioctl/ioctl-number.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- linux-next-20261113.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261113/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -436,6 +436,7 @@ Code Seq# Include File 0xBA 00-0F uapi/linux/liveupdate.h Pasha Tatashin 0xC0 00-0F linux/usb/iowarrior.h +0xC4 00-1F platform/raspberrypi/vchiq-interface/vchiq_ioctl.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.15 @@ -448,7 +449,7 @@ Code Seq# Include File 0xDD 00-3F ZFCP device driver see drivers/s390/scsi/ 0xE5 00-3F linux/fuse.h -0xEC 00-01 linux/platform_data/cros_ec_chardev.h ChromeOS EC driver +0xEC 00-02 linux/platform_data/cros_ec_chardev.h ChromeOS EC driver 0xEE 00-09 uapi/linux/pfrut.h Platform Firmware Runtime Update and Telemetry 0xEF 00-0F uapi/linux/ntfs.h NTFS 0xF3 00-3F drivers/usb/misc/sisusbvga/sisusb.h sisfb Update the list of files where DRM ioctls are defined. Signed-off-by: Randy Dunlap --- [Since having multiple maintainers trying to merge these would cause some conflicts, it would be more manageable for Jon to take all of these through the docs-next tree.] Cc: Jonathan Corbet Cc: Shuah Khan Cc: linux-doc@vger.kernel.org Cc: David Airlie Cc: Simona Vetter Cc: dri-devel@lists.freedesktop.org Cc: Alex Deucher Cc: Christian König Cc: amd-gfx@lists.freedesktop.org Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: Tvrtko Ursulin Cc: intel-gfx@lists.freedesktop.org Cc: Matthew Brost Cc: Thomas Hellström Cc: intel-xe@lists.freedesktop.org Documentation/userspace-api/ioctl/ioctl-number.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- linux-next-20261113.orig/Documentation/userspace-api/ioctl/ioctl-number.rst +++ linux-next-20261113/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -98,6 +98,7 @@ Code Seq# Include File 0x1b all InfiniBand Subsystem 0x20 all drivers/cdrom/cm206.h +0x20 00-01 drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h 0x22 all scsi/sg.h 0x3E 00-0F linux/counter.h '!' 00-1F uapi/linux/seccomp.h @@ -269,7 +270,7 @@ Code Seq# Include File 'c' 08 drivers/scsi/ch.c conflict! 'c' 80-9F arch/s390/include/asm/chsc.h conflict! 'c' A0-AF arch/x86/include/asm/msr.h conflict! -'d' 00-FF linux/char/drm/drm.h conflict! +'d' 00-FF drm/drm.h conflict! 'd' 02-40 pcmcia/ds.h conflict! 'd' F0-FF linux/digi1.h 'e' all linux/digi1.h conflict! @@ -293,6 +294,8 @@ Code Seq# Include File 'h' 00-1F linux/hpet.h conflict! 'h' 80-8F fs/hfsplus/ioctl.c +'i' 00-02 drm/i915_drm.h +'i' 00-04 drm/xe_drm.h 'i' 00-3F linux/i2o-dev.h conflict! 'i' 0B-1F linux/ipmi.h conflict! 'i' 80-8F linux/i8k.h