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 <[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: [email protected]
Cc: "James E.J. Bottomley" <[email protected]>
Cc: "Martin K. Petersen" <[email protected]>
Cc: [email protected]

 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
                                                                        
<http://linux01.gwdg.de/~alatham/ppdd.html>
 '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!

Reply via email to