]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'jc_docs/docs-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:55:41 +0000 (11:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:55:41 +0000 (11:55 +1000)
1  2 
.mailmap
Documentation/admin-guide/kernel-parameters.txt
Documentation/process/submitting-patches.rst
Documentation/translations/it_IT/process/magic-number.rst
Documentation/userspace-api/ioctl/ioctl-number.rst
Documentation/virt/kvm/api.rst
MAINTAINERS

diff --cc .mailmap
Simple merge
index e8c782d155a32de7a8b5f17c53d63d6f364cb723,26bc08e65872647836f4de36bca5c57f572c3718..f452fafb1e84cce85fe65664dab168c9f9090872
@@@ -100,8 -103,8 +100,7 @@@ USB_BLUETOOTH_MAGIC   0x6d02           
  RFCOMM_TTY_MAGIC      0x6d02                                    ``net/bluetooth/rfcomm/tty.c``
  USB_SERIAL_PORT_MAGIC 0x7301           usb_serial_port          ``drivers/usb/serial/usb-serial.h``
  CG_MAGIC              0x00090255       ufs_cylinder_group       ``include/linux/ufs_fs.h``
 -RPORT_MAGIC           0x00525001       r_port                   ``drivers/char/rocket_int.h``
  LSEMAGIC              0x05091998       lse                      ``drivers/fc4/fc.c``
- GDTIOCTL_MAGIC        0x06030f07       gdth_iowr_str            ``drivers/scsi/gdth_ioctl.h``
  RIEBL_MAGIC           0x09051990                                ``drivers/net/atarilance.c``
  NBD_REQUEST_MAGIC     0x12560953       nbd_request              ``include/linux/nbd.h``
  RED_MAGIC2            0x170fc2a5       (any)                    ``mm/slab.c``
Simple merge
diff --cc MAINTAINERS
Simple merge