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 <[email protected]> --- [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 <[email protected]> Cc: Shuah Khan <[email protected]> Cc: [email protected] Cc: Helge Deller <[email protected]> Cc: [email protected] Cc: [email protected] 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 <http://linux01.gwdg.de/~alatham/ppdd.html> +'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 <mailto:[email protected]> '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 <http://web.archive.org/web/%2A/http://www.quicknet.net> '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) - <mailto:[email protected]> +0xF3 00-3F drivers/usb/misc/sisusbvga/sisusb.h sisfb +0xF3 00-3F video/sisfb.h <mailto:[email protected]> 0xF6 all LTTng Linux Trace Toolkit Next Generation <mailto:[email protected]> 0xF8 all arch/x86/include/uapi/asm/amd_hsmp.h AMD HSMP EPYC system management interface driver
