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 <[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: Miquel Raynal <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: Vignesh Raghavendra <[email protected]> Cc: Zhihao Cheng <[email protected]> Cc: [email protected] 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)
