Subject: linux-next: manual merge of the block tree with the jc_docs tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 Jul 2025 15:02:34 +1000

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  Documentation/userspace-api/ioctl/ioctl-number.rst

between commit:

  15afd5def819 ("Documentation: ioctl-number: Extend "Include File" column width")

from the jc_docs tree and commit:

  1cea5180f2f8 ("block: remove pktcdvd driver")

from the block tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/userspace-api/ioctl/ioctl-number.rst
index 677456c31228,4f1532a251d2..000000000000
--- a/Documentation/userspace-api/ioctl/ioctl-number.rst
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
@@@ -223,32 -219,31 +223,31 @@@ Code  Seq#    Include Fil
               fs/xfs/linux-2.6/xfs_ioctl32.h,
               include/linux/falloc.h,
               linux/fs.h,
 -'X'   all    fs/ocfs2/ocfs_fs.h                                      conflict!
 +'X'   all    fs/ocfs2/ocfs_fs.h                                        conflict!
- 'X'   01     linux/pktcdvd.h                                           conflict!
  'Z'   14-15  drivers/message/fusion/mptctl.h
 -'['   00-3F  linux/usb/tmc.h                                         USB Test and Measurement Devices
 -                                                                     <mailto:[email-masked]>
 -'a'   all    linux/atm*.h, linux/sonet.h                             ATM on linux
 -                                                                     <http://lrcwww.epfl.ch/>
 -'a'   00-0F  drivers/crypto/qat/qat_common/adf_cfg_common.h          conflict! qat driver
 -'b'   00-FF                                                          conflict! bit3 vme host bridge
 -                                                                     <mailto:[email-masked]>
 -'b'   00-0F  linux/dma-buf.h                                         conflict!
 -'c'   00-7F  linux/comstats.h                                        conflict!
 -'c'   00-7F  linux/coda.h                                            conflict!
 -'c'   00-1F  linux/chio.h                                            conflict!
 -'c'   80-9F  arch/s390/include/asm/chsc.h                            conflict!
 +'['   00-3F  linux/usb/tmc.h                                           USB Test and Measurement Devices
 +                                                                       <mailto:[email-masked]>
 +'a'   all    linux/atm*.h, linux/sonet.h                               ATM on linux
 +                                                                       <http://lrcwww.epfl.ch/>
 +'a'   00-0F  drivers/crypto/qat/qat_common/adf_cfg_common.h            conflict! qat driver
 +'b'   00-FF                                                            conflict! bit3 vme host bridge
 +                                                                       <mailto:[email-masked]>
 +'b'   00-0F  linux/dma-buf.h                                           conflict!
 +'c'   00-7F  linux/comstats.h                                          conflict!
 +'c'   00-7F  linux/coda.h                                              conflict!
 +'c'   00-1F  linux/chio.h                                              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'   02-40  pcmcia/ds.h                                             conflict!
 +'d'   00-FF  linux/char/drm/drm.h                                      conflict!
 +'d'   02-40  pcmcia/ds.h                                               conflict!
  'd'   F0-FF  linux/digi1.h
 -'e'   all    linux/digi1.h                                           conflict!
 -'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-0F  linux/fs.h                                              conflict!
 -'f'   00-0F  fs/ocfs2/ocfs2_fs.h                                     conflict!
 +'e'   all    linux/digi1.h                                             conflict!
 +'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-0F  linux/fs.h                                                conflict!
 +'f'   00-0F  fs/ocfs2/ocfs2_fs.h                                       conflict!
  'f'   13-27  linux/fscrypt.h
  'f'   81-8F  linux/fsverity.h
  'g'   00-0F  linux/usb/gadgetfs.h