Merge tag 'driver-core-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull driver core updates from Greg KH:
 "Here is the big set of driver core and debug printk changes for
  6.1-rc1. Included in here is:

   - dynamic debug updates for the core and the drm subsystem. The drm
     changes have all been acked by the relevant maintainers

   - kernfs fixes for syzbot reported problems

   - kernfs refactors and updates for cgroup requirements

   - magic number cleanups and removals from the kernel tree (they were
     not being used and they really did not actually do anything)

   - other tiny cleanups

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'driver-core-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (74 commits)
  docs: filesystems: sysfs: Make text and code for ->show() consistent
  Documentation: NBD_REQUEST_MAGIC isn't a magic number
  a.out: restore CMAGIC
  device property: Add const qualifier to device_get_match_data() parameter
  drm_print: add _ddebug descriptor to drm_*dbg prototypes
  drm_print: prefer bare printk KERN_DEBUG on generic fn
  drm_print: optimize drm_debug_enabled for jump-label
  drm-print: add drm_dbg_driver to improve namespace symmetry
  drm-print.h: include dyndbg header
  drm_print: wrap drm_*_dbg in dyndbg descriptor factory macro
  drm_print: interpose drm_*dbg with forwarding macros
  drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers.
  drm_print: condense enum drm_debug_category
  debugfs: use DEFINE_SHOW_ATTRIBUTE to define debugfs_regset32_fops
  driver core: use IS_ERR_OR_NULL() helper in device_create_groups_vargs()
  Documentation: ENI155_MAGIC isn't a magic number
  Documentation: NBD_REPLY_MAGIC isn't a magic number
  nbd: remove define-only NBD_MAGIC, previously magic number
  Documentation: FW_HEADER_MAGIC isn't a magic number
  Documentation: EEPROM_MAGIC_VALUE isn't a magic number
  ...

diff --cc Documentation/driver-api/driver-model/devres.rst
Simple merge

diff --cc Documentation/process/magic-number.rst
index 2326c3be94fc6dd3881f14a4f8e6c0006aee0d0f,c7b4fdf500fe68605bba39438b68368563e23ade..64b5948fc1d49d942edcf686f482f998a99c214c
--- 1/Documentation/process/magic-number.rst
--- 2/Documentation/process/magic-number.rst
+++ b/Documentation/process/magic-number.rst
@@@ -69,69 -69,17 +69,13 @@@ Changelog:
  Magic Name            Number           Structure                File
  ===================== ================ ======================== ==========================================
  PG_MAGIC              'P'              pg_{read,write}_hdr      ``include/linux/pg.h``
- CMAGIC                0x0111           user                     ``include/linux/a.out.h``
- MKISS_DRIVER_MAGIC    0x04bf           mkiss_channel            ``drivers/net/mkiss.h``
 -HDLC_MAGIC            0x239e           n_hdlc                   ``drivers/char/n_hdlc.c``
  APM_BIOS_MAGIC        0x4101           apm_user                 ``arch/x86/kernel/apm_32.c``
- DB_MAGIC              0x4442           fc_info                  ``drivers/net/iph5526_novram.c``
- DL_MAGIC              0x444d           fc_info                  ``drivers/net/iph5526_novram.c``
  FASYNC_MAGIC          0x4601           fasync_struct            ``include/linux/fs.h``
- FF_MAGIC              0x4646           fc_info                  ``drivers/net/iph5526_novram.c``
- PTY_MAGIC             0x5001                                    ``drivers/char/pty.c``
- PPP_MAGIC             0x5002           ppp                      ``include/linux/if_pppvar.h``
- SSTATE_MAGIC          0x5302           serial_state             ``include/linux/serial.h``
  SLIP_MAGIC            0x5302           slip                     ``drivers/net/slip.h``
- STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``
- SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``
- AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``
 -TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``
 -MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``
 -TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``
  MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``
- USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``
- FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``
- USB_BLUETOOTH_MAGIC   0x6d02           usb_bluetooth            ``drivers/usb/class/bluetty.c``
- 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``
- LSEMAGIC              0x05091998       lse                      ``drivers/fc4/fc.c``
- RIEBL_MAGIC           0x09051990                                ``drivers/net/atarilance.c``
- NBD_REQUEST_MAGIC     0x12560953       nbd_request              ``include/linux/nbd.h``
- RED_MAGIC2            0x170fc2a5       (any)                    ``mm/slab.c``
  BAYCOM_MAGIC          0x19730510       baycom_state             ``drivers/net/baycom_epp.c``
- ISDN_X25IFACE_MAGIC   0x1e75a2b9       isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
- ECP_MAGIC             0x21504345       cdkecpsig                ``include/linux/cdk.h``
- LSOMAGIC              0x27091997       lso                      ``drivers/fc4/fc.c``
- LSMAGIC               0x2a3b4d2a       ls                       ``drivers/fc4/fc.c``
- WANPIPE_MAGIC         0x414C4453       sdla_{dump,exec}         ``include/linux/wanpipe.h``
- CS_CARD_MAGIC         0x43525553       cs_card                  ``sound/oss/cs46xx.c``
- LABELCL_MAGIC         0x4857434c       labelcl_info_s           ``include/asm/ia64/sn/labelcl.h``
- ISDN_ASYNC_MAGIC      0x49344C01       modem_info               ``include/linux/isdn.h``
- CTC_ASYNC_MAGIC       0x49344C01       ctc_tty_info             ``drivers/s390/net/ctctty.c``
- ISDN_NET_MAGIC        0x49344C02       isdn_net_local_s         ``drivers/isdn/i4l/isdn_net_lib.h``
- SAVEKMSG_MAGIC2       0x4B4D5347       savekmsg                 ``arch/*/amiga/config.c``
- CS_STATE_MAGIC        0x4c4f4749       cs_state                 ``sound/oss/cs46xx.c``
- SLAB_C_MAGIC          0x4f17a36d       kmem_cache               ``mm/slab.c``
- COW_MAGIC             0x4f4f4f4d       cow_header_v1            ``arch/um/drivers/ubd_user.c``
- I810_CARD_MAGIC       0x5072696E       i810_card                ``sound/oss/i810_audio.c``
- TRIDENT_CARD_MAGIC    0x5072696E       trident_card             ``sound/oss/trident.c``
- ROUTER_MAGIC          0x524d4157       wan_device               [in ``wanrouter.h`` pre 3.9]
- SAVEKMSG_MAGIC1       0x53415645       savekmsg                 ``arch/*/amiga/config.c``
- GDA_MAGIC             0x58464552       gda                      ``arch/mips/include/asm/sn/gda.h``
- RED_MAGIC1            0x5a2cf071       (any)                    ``mm/slab.c``
- EEPROM_MAGIC_VALUE    0x5ab478d2       lanai_dev                ``drivers/atm/lanai.c``
  HDLCDRV_MAGIC         0x5ac6e778       hdlcdrv_state            ``include/linux/hdlcdrv.h``
- PCXX_MAGIC            0x5c6df104       channel                  ``drivers/char/pcxx.h``
  KV_MAGIC              0x5f4b565f       kernel_vars_s            ``arch/mips/include/asm/sn/klkernvars.h``
- I810_STATE_MAGIC      0x63657373       i810_state               ``sound/oss/i810_audio.c``
- TRIDENT_STATE_MAGIC   0x63657373       trient_state             ``sound/oss/trident.c``
- M3_CARD_MAGIC         0x646e6f50       m3_card                  ``sound/oss/maestro3.c``
- FW_HEADER_MAGIC       0x65726F66       fw_header                ``drivers/atm/fore200e.h``
- SLOT_MAGIC            0x67267321       slot                     ``drivers/hotplug/cpqphp.h``
- SLOT_MAGIC            0x67267322       slot                     ``drivers/hotplug/acpiphp.h``
- LO_MAGIC              0x68797548       nbd_device               ``include/linux/nbd.h``
- M3_STATE_MAGIC        0x734d724d       m3_state                 ``sound/oss/maestro3.c``
- VMALLOC_MAGIC         0x87654320       snd_alloc_track          ``sound/core/memory.c``
- KMALLOC_MAGIC         0x87654321       snd_alloc_track          ``sound/core/memory.c``
- PWC_MAGIC             0x89DC10AB       pwc_device               ``drivers/usb/media/pwc.h``
- NBD_REPLY_MAGIC       0x96744668       nbd_reply                ``include/linux/nbd.h``
- ENI155_MAGIC          0xa54b872d       midway_eprom           ``drivers/atm/eni.h``
  CODA_MAGIC            0xC0DAC0DA       coda_file_info           ``fs/coda/coda_fs_i.h``
  YAM_MAGIC             0xF10A7654       yam_port                 ``drivers/net/hamradio/yam.c``
  CCB_MAGIC             0xf2691ad2       ccb                      ``drivers/scsi/ncr53c8xx.c``

diff --cc Documentation/translations/it_IT/process/magic-number.rst
index 1803497816f1e806eff7917cde02fef1ac630dbd,8ca59c0395d397d8f6af58b380465734644db198..02eb7eb2448e77af709eb02ffd370ba6da6ba284
--- 1/Documentation/translations/it_IT/process/magic-number.rst
--- 2/Documentation/translations/it_IT/process/magic-number.rst
+++ b/Documentation/translations/it_IT/process/magic-number.rst
@@@ -75,69 -75,17 +75,13 @@@ Registro dei cambiamenti:
  Nome magico           Numero           Struttura                File
  ===================== ================ ======================== ==========================================
  PG_MAGIC              'P'              pg_{read,write}_hdr      ``include/linux/pg.h``
- CMAGIC                0x0111           user                     ``include/linux/a.out.h``
- MKISS_DRIVER_MAGIC    0x04bf           mkiss_channel            ``drivers/net/mkiss.h``
 -HDLC_MAGIC            0x239e           n_hdlc                   ``drivers/char/n_hdlc.c``
  APM_BIOS_MAGIC        0x4101           apm_user                 ``arch/x86/kernel/apm_32.c``
- DB_MAGIC              0x4442           fc_info                  ``drivers/net/iph5526_novram.c``
- DL_MAGIC              0x444d           fc_info                  ``drivers/net/iph5526_novram.c``
  FASYNC_MAGIC          0x4601           fasync_struct            ``include/linux/fs.h``
- FF_MAGIC              0x4646           fc_info                  ``drivers/net/iph5526_novram.c``
- PTY_MAGIC             0x5001                                    ``drivers/char/pty.c``
- PPP_MAGIC             0x5002           ppp                      ``include/linux/if_pppvar.h``
- SSTATE_MAGIC          0x5302           serial_state             ``include/linux/serial.h``
  SLIP_MAGIC            0x5302           slip                     ``drivers/net/slip.h``
- STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``
- SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``
- AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``
 -TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``
 -MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``
 -TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``
  MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``
- USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``
- FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``
- USB_BLUETOOTH_MAGIC   0x6d02           usb_bluetooth            ``drivers/usb/class/bluetty.c``
- 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``
- LSEMAGIC              0x05091998       lse                      ``drivers/fc4/fc.c``
- RIEBL_MAGIC           0x09051990                                ``drivers/net/atarilance.c``
- NBD_REQUEST_MAGIC     0x12560953       nbd_request              ``include/linux/nbd.h``
- RED_MAGIC2            0x170fc2a5       (any)                    ``mm/slab.c``
  BAYCOM_MAGIC          0x19730510       baycom_state             ``drivers/net/baycom_epp.c``
- ISDN_X25IFACE_MAGIC   0x1e75a2b9       isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
- ECP_MAGIC             0x21504345       cdkecpsig                ``include/linux/cdk.h``
- LSOMAGIC              0x27091997       lso                      ``drivers/fc4/fc.c``
- LSMAGIC               0x2a3b4d2a       ls                       ``drivers/fc4/fc.c``
- WANPIPE_MAGIC         0x414C4453       sdla_{dump,exec}         ``include/linux/wanpipe.h``
- CS_CARD_MAGIC         0x43525553       cs_card                  ``sound/oss/cs46xx.c``
- LABELCL_MAGIC         0x4857434c       labelcl_info_s           ``include/asm/ia64/sn/labelcl.h``
- ISDN_ASYNC_MAGIC      0x49344C01       modem_info               ``include/linux/isdn.h``
- CTC_ASYNC_MAGIC       0x49344C01       ctc_tty_info             ``drivers/s390/net/ctctty.c``
- ISDN_NET_MAGIC        0x49344C02       isdn_net_local_s         ``drivers/isdn/i4l/isdn_net_lib.h``
- SAVEKMSG_MAGIC2       0x4B4D5347       savekmsg                 ``arch/*/amiga/config.c``
- CS_STATE_MAGIC        0x4c4f4749       cs_state                 ``sound/oss/cs46xx.c``
- SLAB_C_MAGIC          0x4f17a36d       kmem_cache               ``mm/slab.c``
- COW_MAGIC             0x4f4f4f4d       cow_header_v1            ``arch/um/drivers/ubd_user.c``
- I810_CARD_MAGIC       0x5072696E       i810_card                ``sound/oss/i810_audio.c``
- TRIDENT_CARD_MAGIC    0x5072696E       trident_card             ``sound/oss/trident.c``
- ROUTER_MAGIC          0x524d4157       wan_device               [in ``wanrouter.h`` pre 3.9]
- SAVEKMSG_MAGIC1       0x53415645       savekmsg                 ``arch/*/amiga/config.c``
- GDA_MAGIC             0x58464552       gda                      ``arch/mips/include/asm/sn/gda.h``
- RED_MAGIC1            0x5a2cf071       (any)                    ``mm/slab.c``
- EEPROM_MAGIC_VALUE    0x5ab478d2       lanai_dev                ``drivers/atm/lanai.c``
  HDLCDRV_MAGIC         0x5ac6e778       hdlcdrv_state            ``include/linux/hdlcdrv.h``
- PCXX_MAGIC            0x5c6df104       channel                  ``drivers/char/pcxx.h``
  KV_MAGIC              0x5f4b565f       kernel_vars_s            ``arch/mips/include/asm/sn/klkernvars.h``
- I810_STATE_MAGIC      0x63657373       i810_state               ``sound/oss/i810_audio.c``
- TRIDENT_STATE_MAGIC   0x63657373       trient_state             ``sound/oss/trident.c``
- M3_CARD_MAGIC         0x646e6f50       m3_card                  ``sound/oss/maestro3.c``
- FW_HEADER_MAGIC       0x65726F66       fw_header                ``drivers/atm/fore200e.h``
- SLOT_MAGIC            0x67267321       slot                     ``drivers/hotplug/cpqphp.h``
- SLOT_MAGIC            0x67267322       slot                     ``drivers/hotplug/acpiphp.h``
- LO_MAGIC              0x68797548       nbd_device               ``include/linux/nbd.h``
- M3_STATE_MAGIC        0x734d724d       m3_state                 ``sound/oss/maestro3.c``
- VMALLOC_MAGIC         0x87654320       snd_alloc_track          ``sound/core/memory.c``
- KMALLOC_MAGIC         0x87654321       snd_alloc_track          ``sound/core/memory.c``
- PWC_MAGIC             0x89DC10AB       pwc_device               ``drivers/usb/media/pwc.h``
- NBD_REPLY_MAGIC       0x96744668       nbd_reply                ``include/linux/nbd.h``
- ENI155_MAGIC          0xa54b872d       midway_eprom           ``drivers/atm/eni.h``
  CODA_MAGIC            0xC0DAC0DA       coda_file_info           ``fs/coda/coda_fs_i.h``
  YAM_MAGIC             0xF10A7654       yam_port                 ``drivers/net/hamradio/yam.c``
  CCB_MAGIC             0xf2691ad2       ccb                      ``drivers/scsi/ncr53c8xx.c``

diff --cc Documentation/translations/zh_CN/process/magic-number.rst
index 9780bf710eebcc4f66732a36e0767b32544808b5,b6d2bb4322a34407af7afb67874a50f9ec1b5620..0617ce125e127b0fed587c2b043fa331b8a50571
--- 1/Documentation/translations/zh_CN/process/magic-number.rst
--- 2/Documentation/translations/zh_CN/process/magic-number.rst
+++ b/Documentation/translations/zh_CN/process/magic-number.rst
@@@ -58,72 -58,18 +58,14 @@@ Linux é­\94æ\9c¯æ\95
  魔术数名              数字             结构                     文件
  ===================== ================ ======================== ==========================================
  PG_MAGIC              'P'              pg_{read,write}_hdr      ``include/linux/pg.h``
- CMAGIC                0x0111           user                     ``include/linux/a.out.h``
- MKISS_DRIVER_MAGIC    0x04bf           mkiss_channel            ``drivers/net/mkiss.h``
 -HDLC_MAGIC            0x239e           n_hdlc                   ``drivers/char/n_hdlc.c``
  APM_BIOS_MAGIC        0x4101           apm_user                 ``arch/x86/kernel/apm_32.c``
- DB_MAGIC              0x4442           fc_info                  ``drivers/net/iph5526_novram.c``
- DL_MAGIC              0x444d           fc_info                  ``drivers/net/iph5526_novram.c``
  FASYNC_MAGIC          0x4601           fasync_struct            ``include/linux/fs.h``
- FF_MAGIC              0x4646           fc_info                  ``drivers/net/iph5526_novram.c``
- PTY_MAGIC             0x5001                                    ``drivers/char/pty.c``
- PPP_MAGIC             0x5002           ppp                      ``include/linux/if_pppvar.h``
- SSTATE_MAGIC          0x5302           serial_state             ``include/linux/serial.h``
  SLIP_MAGIC            0x5302           slip                     ``drivers/net/slip.h``
- STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``
- SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``
- AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``
 -TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``
 -MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``
 -TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``
  MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``
- USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``
- FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``
- USB_BLUETOOTH_MAGIC   0x6d02           usb_bluetooth            ``drivers/usb/class/bluetty.c``
- 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``
- 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``
  BAYCOM_MAGIC          0x19730510       baycom_state             ``drivers/net/baycom_epp.c``
- ISDN_X25IFACE_MAGIC   0x1e75a2b9       isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
- ECP_MAGIC             0x21504345       cdkecpsig                ``include/linux/cdk.h``
- LSOMAGIC              0x27091997       lso                      ``drivers/fc4/fc.c``
- LSMAGIC               0x2a3b4d2a       ls                       ``drivers/fc4/fc.c``
- WANPIPE_MAGIC         0x414C4453       sdla_{dump,exec}         ``include/linux/wanpipe.h``
- CS_CARD_MAGIC         0x43525553       cs_card                  ``sound/oss/cs46xx.c``
- LABELCL_MAGIC         0x4857434c       labelcl_info_s           ``include/asm/ia64/sn/labelcl.h``
- ISDN_ASYNC_MAGIC      0x49344C01       modem_info               ``include/linux/isdn.h``
- CTC_ASYNC_MAGIC       0x49344C01       ctc_tty_info             ``drivers/s390/net/ctctty.c``
- ISDN_NET_MAGIC        0x49344C02       isdn_net_local_s         ``drivers/isdn/i4l/isdn_net_lib.h``
- SAVEKMSG_MAGIC2       0x4B4D5347       savekmsg                 ``arch/*/amiga/config.c``
- CS_STATE_MAGIC        0x4c4f4749       cs_state                 ``sound/oss/cs46xx.c``
- SLAB_C_MAGIC          0x4f17a36d       kmem_cache               ``mm/slab.c``
- COW_MAGIC             0x4f4f4f4d       cow_header_v1            ``arch/um/drivers/ubd_user.c``
- I810_CARD_MAGIC       0x5072696E       i810_card                ``sound/oss/i810_audio.c``
- TRIDENT_CARD_MAGIC    0x5072696E       trident_card             ``sound/oss/trident.c``
- ROUTER_MAGIC          0x524d4157       wan_device               [in ``wanrouter.h`` pre 3.9]
- SAVEKMSG_MAGIC1       0x53415645       savekmsg                 ``arch/*/amiga/config.c``
- GDA_MAGIC             0x58464552       gda                      ``arch/mips/include/asm/sn/gda.h``
- RED_MAGIC1            0x5a2cf071       (any)                    ``mm/slab.c``
- EEPROM_MAGIC_VALUE    0x5ab478d2       lanai_dev                ``drivers/atm/lanai.c``
  HDLCDRV_MAGIC         0x5ac6e778       hdlcdrv_state            ``include/linux/hdlcdrv.h``
- PCXX_MAGIC            0x5c6df104       channel                  ``drivers/char/pcxx.h``
  KV_MAGIC              0x5f4b565f       kernel_vars_s            ``arch/mips/include/asm/sn/klkernvars.h``
- I810_STATE_MAGIC      0x63657373       i810_state               ``sound/oss/i810_audio.c``
- TRIDENT_STATE_MAGIC   0x63657373       trient_state             ``sound/oss/trident.c``
- M3_CARD_MAGIC         0x646e6f50       m3_card                  ``sound/oss/maestro3.c``
- FW_HEADER_MAGIC       0x65726F66       fw_header                ``drivers/atm/fore200e.h``
- SLOT_MAGIC            0x67267321       slot                     ``drivers/hotplug/cpqphp.h``
- SLOT_MAGIC            0x67267322       slot                     ``drivers/hotplug/acpiphp.h``
- LO_MAGIC              0x68797548       nbd_device               ``include/linux/nbd.h``
- M3_STATE_MAGIC        0x734d724d       m3_state                 ``sound/oss/maestro3.c``
- VMALLOC_MAGIC         0x87654320       snd_alloc_track          ``sound/core/memory.c``
- KMALLOC_MAGIC         0x87654321       snd_alloc_track          ``sound/core/memory.c``
- PWC_MAGIC             0x89DC10AB       pwc_device               ``drivers/usb/media/pwc.h``
- NBD_REPLY_MAGIC       0x96744668       nbd_reply                ``include/linux/nbd.h``
- ENI155_MAGIC          0xa54b872d       midway_eprom           ``drivers/atm/eni.h``
  CODA_MAGIC            0xC0DAC0DA       coda_file_info           ``fs/coda/coda_fs_i.h``
- DPMEM_MAGIC           0xc0ffee11       gdt_pci_sram             ``drivers/scsi/gdth.h``
  YAM_MAGIC             0xF10A7654       yam_port                 ``drivers/net/hamradio/yam.c``
  CCB_MAGIC             0xf2691ad2       ccb                      ``drivers/scsi/ncr53c8xx.c``
  QUEUE_MAGIC_FREE      0xf7e1c9a3       queue_entry              ``drivers/scsi/arm/queue.c``

diff --cc Documentation/translations/zh_TW/process/magic-number.rst
index 933545e92137abb843f6c07ed77d1aafcb3e3008,52169e6543ee2a82a8b3ddbcfcf926e5d3fe732b..f3f7082e17c61e1020be01ac11041029d6e68d62
--- 1/Documentation/translations/zh_TW/process/magic-number.rst
--- 2/Documentation/translations/zh_TW/process/magic-number.rst
+++ b/Documentation/translations/zh_TW/process/magic-number.rst
@@@ -61,72 -61,18 +61,14 @@@ Linux é­\94è¡\93æ\95
  魔術數名              數字             結構                     文件
  ===================== ================ ======================== ==========================================
  PG_MAGIC              'P'              pg_{read,write}_hdr      ``include/linux/pg.h``
- CMAGIC                0x0111           user                     ``include/linux/a.out.h``
- MKISS_DRIVER_MAGIC    0x04bf           mkiss_channel            ``drivers/net/mkiss.h``
 -HDLC_MAGIC            0x239e           n_hdlc                   ``drivers/char/n_hdlc.c``
  APM_BIOS_MAGIC        0x4101           apm_user                 ``arch/x86/kernel/apm_32.c``
- DB_MAGIC              0x4442           fc_info                  ``drivers/net/iph5526_novram.c``
- DL_MAGIC              0x444d           fc_info                  ``drivers/net/iph5526_novram.c``
  FASYNC_MAGIC          0x4601           fasync_struct            ``include/linux/fs.h``
- FF_MAGIC              0x4646           fc_info                  ``drivers/net/iph5526_novram.c``
- PTY_MAGIC             0x5001                                    ``drivers/char/pty.c``
- PPP_MAGIC             0x5002           ppp                      ``include/linux/if_pppvar.h``
- SSTATE_MAGIC          0x5302           serial_state             ``include/linux/serial.h``
  SLIP_MAGIC            0x5302           slip                     ``drivers/net/slip.h``
- STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``
- SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``
- AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``
 -TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``
 -MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``
 -TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``
  MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``
- USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``
- FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``
- USB_BLUETOOTH_MAGIC   0x6d02           usb_bluetooth            ``drivers/usb/class/bluetty.c``
- 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``
- 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``
  BAYCOM_MAGIC          0x19730510       baycom_state             ``drivers/net/baycom_epp.c``
- ISDN_X25IFACE_MAGIC   0x1e75a2b9       isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
- ECP_MAGIC             0x21504345       cdkecpsig                ``include/linux/cdk.h``
- LSOMAGIC              0x27091997       lso                      ``drivers/fc4/fc.c``
- LSMAGIC               0x2a3b4d2a       ls                       ``drivers/fc4/fc.c``
- WANPIPE_MAGIC         0x414C4453       sdla_{dump,exec}         ``include/linux/wanpipe.h``
- CS_CARD_MAGIC         0x43525553       cs_card                  ``sound/oss/cs46xx.c``
- LABELCL_MAGIC         0x4857434c       labelcl_info_s           ``include/asm/ia64/sn/labelcl.h``
- ISDN_ASYNC_MAGIC      0x49344C01       modem_info               ``include/linux/isdn.h``
- CTC_ASYNC_MAGIC       0x49344C01       ctc_tty_info             ``drivers/s390/net/ctctty.c``
- ISDN_NET_MAGIC        0x49344C02       isdn_net_local_s         ``drivers/isdn/i4l/isdn_net_lib.h``
- SAVEKMSG_MAGIC2       0x4B4D5347       savekmsg                 ``arch/*/amiga/config.c``
- CS_STATE_MAGIC        0x4c4f4749       cs_state                 ``sound/oss/cs46xx.c``
- SLAB_C_MAGIC          0x4f17a36d       kmem_cache               ``mm/slab.c``
- COW_MAGIC             0x4f4f4f4d       cow_header_v1            ``arch/um/drivers/ubd_user.c``
- I810_CARD_MAGIC       0x5072696E       i810_card                ``sound/oss/i810_audio.c``
- TRIDENT_CARD_MAGIC    0x5072696E       trident_card             ``sound/oss/trident.c``
- ROUTER_MAGIC          0x524d4157       wan_device               [in ``wanrouter.h`` pre 3.9]
- SAVEKMSG_MAGIC1       0x53415645       savekmsg                 ``arch/*/amiga/config.c``
- GDA_MAGIC             0x58464552       gda                      ``arch/mips/include/asm/sn/gda.h``
- RED_MAGIC1            0x5a2cf071       (any)                    ``mm/slab.c``
- EEPROM_MAGIC_VALUE    0x5ab478d2       lanai_dev                ``drivers/atm/lanai.c``
  HDLCDRV_MAGIC         0x5ac6e778       hdlcdrv_state            ``include/linux/hdlcdrv.h``
- PCXX_MAGIC            0x5c6df104       channel                  ``drivers/char/pcxx.h``
  KV_MAGIC              0x5f4b565f       kernel_vars_s            ``arch/mips/include/asm/sn/klkernvars.h``
- I810_STATE_MAGIC      0x63657373       i810_state               ``sound/oss/i810_audio.c``
- TRIDENT_STATE_MAGIC   0x63657373       trient_state             ``sound/oss/trident.c``
- M3_CARD_MAGIC         0x646e6f50       m3_card                  ``sound/oss/maestro3.c``
- FW_HEADER_MAGIC       0x65726F66       fw_header                ``drivers/atm/fore200e.h``
- SLOT_MAGIC            0x67267321       slot                     ``drivers/hotplug/cpqphp.h``
- SLOT_MAGIC            0x67267322       slot                     ``drivers/hotplug/acpiphp.h``
- LO_MAGIC              0x68797548       nbd_device               ``include/linux/nbd.h``
- M3_STATE_MAGIC        0x734d724d       m3_state                 ``sound/oss/maestro3.c``
- VMALLOC_MAGIC         0x87654320       snd_alloc_track          ``sound/core/memory.c``
- KMALLOC_MAGIC         0x87654321       snd_alloc_track          ``sound/core/memory.c``
- PWC_MAGIC             0x89DC10AB       pwc_device               ``drivers/usb/media/pwc.h``
- NBD_REPLY_MAGIC       0x96744668       nbd_reply                ``include/linux/nbd.h``
- ENI155_MAGIC          0xa54b872d       midway_eprom           ``drivers/atm/eni.h``
  CODA_MAGIC            0xC0DAC0DA       coda_file_info           ``fs/coda/coda_fs_i.h``
- DPMEM_MAGIC           0xc0ffee11       gdt_pci_sram             ``drivers/scsi/gdth.h``
  YAM_MAGIC             0xF10A7654       yam_port                 ``drivers/net/hamradio/yam.c``
  CCB_MAGIC             0xf2691ad2       ccb                      ``drivers/scsi/ncr53c8xx.c``
  QUEUE_MAGIC_FREE      0xf7e1c9a3       queue_entry              ``drivers/scsi/arm/queue.c``

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/nbd.c
Simple merge

diff --cc drivers/gpu/drm/Kconfig
index 198ba846d34bf7b5f2c143a9b443ef912354852d,2438e0dccfa16765705404d9d0fee5ca8a56463a..34f5a092c99e72f3a3b8744fa5b71f80de96e9b6
--- 1/drivers/gpu/drm/Kconfig
--- 2/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -51,9 -50,22 +51,21 @@@ config DRM_DEBUG_M
  
          If in doubt, say "N".
  
 -config DRM_DEBUG_SELFTEST
 -      tristate "kselftests for DRM"
 -      depends on DRM
 -      depends on DEBUG_KERNEL
+ config DRM_USE_DYNAMIC_DEBUG
+       bool "use dynamic debug to implement drm.debug"
+       default y
+       depends on DRM
+       depends on DYNAMIC_DEBUG || DYNAMIC_DEBUG_CORE
+       depends on JUMP_LABEL
+       help
+         Use dynamic-debug to avoid drm_debug_enabled() runtime overheads.
+         Due to callsite counts in DRM drivers (~4k in amdgpu) and 56
+         bytes per callsite, the .data costs can be substantial, and
+         are therefore configurable.
+ 
 +config DRM_KUNIT_TEST
 +      tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS
 +      depends on DRM && KUNIT
        select PRIME_NUMBERS
        select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HELPER

diff --cc drivers/gpu/drm/Makefile
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/display/drm_dp_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_crtc_helper.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc kernel/cgroup/cgroup.c
Simple merge

diff --cc kernel/module/main.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc net/bluetooth/rfcomm/tty.c
Simple merge