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 <[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: Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: [email protected]

 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                                             
<mailto:[email protected]>
 '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                                        
<mailto:[email protected]>
-'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!

Reply via email to