]> Git Repo - linux.git/commitdiff
Merge tag 'driver-core-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <[email protected]>
Sat, 8 Oct 2022 00:04:10 +0000 (17:04 -0700)
committerLinus Torvalds <[email protected]>
Sat, 8 Oct 2022 00:04:10 +0000 (17:04 -0700)
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
  ...

18 files changed:
1  2 
Documentation/driver-api/driver-model/devres.rst
Documentation/process/magic-number.rst
Documentation/translations/it_IT/process/magic-number.rst
Documentation/translations/zh_CN/process/magic-number.rst
Documentation/translations/zh_TW/process/magic-number.rst
MAINTAINERS
drivers/block/nbd.c
drivers/gpu/drm/Kconfig
drivers/gpu/drm/Makefile
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/display/drm_dp_helper.c
drivers/gpu/drm/drm_crtc_helper.c
include/asm-generic/vmlinux.lds.h
kernel/cgroup/cgroup.c
kernel/module/main.c
lib/Kconfig.debug
lib/Makefile
net/bluetooth/rfcomm/tty.c

index 5e6de4ab25dc13f9c1f9b751196571c24d713359,2af6c9c09e59605796fc5fbec63ec129edb1061b..687adb58048ec203239069bef32475634d2f7a88
@@@ -301,7 -301,6 +301,7 @@@ IO regio
    devm_release_region()
    devm_release_resource()
    devm_request_mem_region()
 +  devm_request_free_mem_region()
    devm_request_region()
    devm_request_resource()
  
@@@ -311,7 -310,6 +311,6 @@@ IOMA
    devm_ioremap()
    devm_ioremap_uc()
    devm_ioremap_wc()
-   devm_ioremap_np()
    devm_ioremap_resource() : checks resource, requests memory region, ioremaps
    devm_ioremap_resource_wc()
    devm_platform_ioremap_resource() : calls devm_ioremap_resource() for platform device
@@@ -335,7 -333,7 +334,7 @@@ IR
    devm_irq_alloc_descs_from()
    devm_irq_alloc_generic_chip()
    devm_irq_setup_generic_chip()
 -  devm_irq_sim_init()
 +  devm_irq_domain_create_sim()
  
  LED
    devm_led_classdev_register()
@@@ -393,9 -391,7 +392,9 @@@ PH
  PINCTRL
    devm_pinctrl_get()
    devm_pinctrl_put()
 +  devm_pinctrl_get_select()
    devm_pinctrl_register()
 +  devm_pinctrl_register_and_init()
    devm_pinctrl_unregister()
  
  POWER
  
  PWM
    devm_pwm_get()
 -  devm_of_pwm_get()
    devm_fwnode_pwm_get()
  
  REGULATOR
 +  devm_regulator_bulk_register_supply_alias()
    devm_regulator_bulk_get()
 +  devm_regulator_bulk_get_enable()
 +  devm_regulator_bulk_put()
    devm_regulator_get()
 +  devm_regulator_get_enable()
 +  devm_regulator_get_enable_optional()
 +  devm_regulator_get_exclusive()
 +  devm_regulator_get_optional()
 +  devm_regulator_irq_helper()
    devm_regulator_put()
    devm_regulator_register()
 +  devm_regulator_register_notifier()
 +  devm_regulator_register_supply_alias()
 +  devm_regulator_unregister_notifier()
  
  RESET
    devm_reset_control_get()
@@@ -440,8 -426,6 +439,8 @@@ SLAVE DMA ENGIN
    devm_acpi_dma_controller_register()
  
  SPI
 +  devm_spi_alloc_master()
 +  devm_spi_alloc_slave()
    devm_spi_register_master()
  
  WATCHDOG
index 2326c3be94fc6dd3881f14a4f8e6c0006aee0d0f,c7b4fdf500fe68605bba39438b68368563e23ade..64b5948fc1d49d942edcf686f482f998a99c214c
@@@ -69,82 -69,21 +69,17 @@@ 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``
  QUEUE_MAGIC_FREE      0xf7e1c9a3       queue_entry              ``drivers/scsi/arm/queue.c``
  QUEUE_MAGIC_USED      0xf7e1cc33       queue_entry              ``drivers/scsi/arm/queue.c``
- HTB_CMAGIC            0xFEFAFEF1       htb_class                ``net/sched/sch_htb.c``
  NMI_MAGIC             0x48414d4d455201 nmi_s                    ``arch/mips/include/asm/sn/nmi.h``
  ===================== ================ ======================== ==========================================
- Note that there are also defined special per-driver magic numbers in sound
- memory management. See ``include/sound/sndmagic.h`` for complete list of them. Many
- OSS sound drivers have their magic numbers constructed from the soundcard PCI
- ID - these are not listed here as well.
- HFS is another larger user of magic numbers - you can find them in
- ``fs/hfs/hfs.h``.
index 1803497816f1e806eff7917cde02fef1ac630dbd,8ca59c0395d397d8f6af58b380465734644db198..02eb7eb2448e77af709eb02ffd370ba6da6ba284
@@@ -75,83 -75,21 +75,17 @@@ 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``
  QUEUE_MAGIC_FREE      0xf7e1c9a3       queue_entry              ``drivers/scsi/arm/queue.c``
  QUEUE_MAGIC_USED      0xf7e1cc33       queue_entry              ``drivers/scsi/arm/queue.c``
- HTB_CMAGIC            0xFEFAFEF1       htb_class                ``net/sched/sch_htb.c``
  NMI_MAGIC             0x48414d4d455201 nmi_s                    ``arch/mips/include/asm/sn/nmi.h``
  ===================== ================ ======================== ==========================================
- Da notare che ci sono anche dei numeri magici specifici per driver nel
- *sound memory management*. Consultate ``include/sound/sndmagic.h`` per una
- lista completa.  Molti driver audio OSS hanno i loro numeri magici costruiti a
- partire dall'identificativo PCI della scheda audio - nemmeno questi sono
- elencati in questo file.
- Il file-system HFS è un altro grande utilizzatore di numeri magici - potete
- trovarli qui ``fs/hfs/hfs.h``.
index 9780bf710eebcc4f66732a36e0767b32544808b5,b6d2bb4322a34407af7afb67874a50f9ec1b5620..0617ce125e127b0fed587c2b043fa331b8a50571
@@@ -58,83 -58,21 +58,17 @@@ 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``
  QUEUE_MAGIC_USED      0xf7e1cc33       queue_entry              ``drivers/scsi/arm/queue.c``
- HTB_CMAGIC            0xFEFAFEF1       htb_class                ``net/sched/sch_htb.c``
  NMI_MAGIC             0x48414d4d455201 nmi_s                    ``arch/mips/include/asm/sn/nmi.h``
  ===================== ================ ======================== ==========================================
- 请注意,在声音记忆管理中仍然有一些特殊的为每个驱动定义的魔术值。查看include/sound/sndmagic.h来获取他们完整的列表信息。很多OSS声音驱动拥有自己从声卡PCI ID构建的魔术值-他们也没有被列在这里。
- IrDA子系统也使用了大量的自己的魔术值,查看include/net/irda/irda.h来获取他们完整的信息。
- HFS是另外一个比较大的使用魔术值的文件系统-你可以在fs/hfs/hfs.h中找到他们。
index 933545e92137abb843f6c07ed77d1aafcb3e3008,52169e6543ee2a82a8b3ddbcfcf926e5d3fe732b..f3f7082e17c61e1020be01ac11041029d6e68d62
@@@ -61,84 -61,21 +61,17 @@@ 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``
  QUEUE_MAGIC_USED      0xf7e1cc33       queue_entry              ``drivers/scsi/arm/queue.c``
- HTB_CMAGIC            0xFEFAFEF1       htb_class                ``net/sched/sch_htb.c``
  NMI_MAGIC             0x48414d4d455201 nmi_s                    ``arch/mips/include/asm/sn/nmi.h``
  ===================== ================ ======================== ==========================================
- 請注意,在聲音記憶管理中仍然有一些特殊的爲每個驅動定義的魔術值。查看include/sound/sndmagic.h來獲取他們完整的列表信息。很多OSS聲音驅動擁有自己從音效卡PCI ID構建的魔術值-他們也沒有被列在這裡。
- IrDA子系統也使用了大量的自己的魔術值,查看include/net/irda/irda.h來獲取他們完整的信息。
- HFS是另外一個比較大的使用魔術值的文件系統-你可以在fs/hfs/hfs.h中找到他們。
diff --combined MAINTAINERS
index 04b7e12ef71974cb673b81cd77251c646dc7060e,3f7368ad1d67af5266ed448b066b07ebf7640d5c..f37a0360c76c9624462baffe58eb7c4238e3523e
@@@ -348,6 -348,7 +348,6 @@@ M: "Rafael J. Wysocki" <[email protected]
  R:    Len Brown <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linux-acpi
  Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  B:    https://bugzilla.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
@@@ -426,6 -427,7 +426,6 @@@ M: Rafael J. Wysocki <[email protected]
  R:    Zhang Rui <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linux-acpi
  B:    https://bugzilla.kernel.org
  F:    drivers/acpi/*thermal*
  
@@@ -748,12 -750,6 +748,12 @@@ S:       Supporte
  F:    drivers/infiniband/hw/erdma
  F:    include/uapi/rdma/erdma-abi.h
  
 +ALIBABA PMU DRIVER
 +M:    Shuai Xue <[email protected]>
 +S:    Supported
 +F:    Documentation/admin-guide/perf/alibaba_pmu.rst
 +F:    drivers/perf/alibaba_uncore_dwr_pmu.c
 +
  ALIENWARE WMI DRIVER
  L:    [email protected]
  S:    Maintained
@@@ -825,13 -821,6 +825,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/staging/media/sunxi/cedrus/
  
 +ALLWINNER DMIC DRIVERS
 +M:    Ban Tao <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml
 +F:    sound/soc/sunxi/sun50i-dmic.c
 +
  ALPHA PORT
  M:    Richard Henderson <[email protected]>
  M:    Ivan Kokshaysky <[email protected]>
@@@ -890,13 -879,6 +890,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/altera/
  
 +ALTERA TSE PCS
 +M:    Maxime Chevallier <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/pcs/pcs-altera-tse.c
 +F:    include/linux/pcs-altera-tse.h
 +
  ALTERA UART/JTAG UART SERIAL DRIVERS
  M:    Tobias Klauser <[email protected]>
  L:    [email protected]
@@@ -1029,6 -1011,7 +1029,6 @@@ F:      drivers/spi/spi-amd.
  
  AMD MP2 I2C DRIVER
  M:    Elie Morisse <[email protected]>
 -M:    Nehal Shah <[email protected]>
  M:    Shyam Sundar S K <[email protected]>
  L:    [email protected]
  S:    Maintained
  S:    Maintained
  F:    drivers/platform/x86/amd/pmc.c
  
 +AMD PMF DRIVER
 +M:    Shyam Sundar S K <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-amd-pmf
 +F:    drivers/platform/x86/amd/pmf/
 +
  AMD HSMP DRIVER
  M:    Naveen Krishna Chatradhi <[email protected]>
  R:    Carlos Bilbao <[email protected]>
@@@ -1070,7 -1046,6 +1070,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/admin-guide/pm/amd-pstate.rst
  F:    drivers/cpufreq/amd-pstate*
 +F:    include/linux/amd-pstate.h
  F:    tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
  
  AMD PTDMA DRIVER
@@@ -1360,15 -1335,6 +1360,15 @@@ F:    drivers/iio/amplifiers/hmc425a.
  F:    drivers/staging/iio/*/ad*
  X:    drivers/iio/*/adjd*
  
 +ANALOG DEVICES INC MAX31760 DRIVER
 +M:    Ibrahim Tilki <[email protected]>
 +S:    Maintained
 +W:    http://wiki.analog.com/
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/hwmon/adi,max31760.yaml
 +F:    Documentation/hwmon/max31760.rst
 +F:    drivers/hwmon/max31760.c
 +
  ANALOGBITS PLL LIBRARIES
  M:    Paul Walmsley <[email protected]>
  S:    Supported
@@@ -1934,15 -1900,6 +1934,15 @@@ F:    include/dt-bindings/pinctrl/apple.
  F:    include/linux/apple-mailbox.h
  F:    include/linux/soc/apple/*
  
 +ARM/APPLE MACHINE SOUND DRIVERS
 +M:    Martin Povišer <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/apple,*
 +F:    sound/soc/apple/*
 +F:    sound/soc/codecs/cs42l83-i2c.c
 +
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <[email protected]>
  M:    Lars Persson <[email protected]>
@@@ -2438,7 -2395,6 +2438,7 @@@ N:      atme
  ARM/Microchip Sparx5 SoC support
  M:    Lars Povlsen <[email protected]>
  M:    Steen Hegelund <[email protected]>
 +M:    Daniel Machon <[email protected]>
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -2624,7 -2580,7 +2624,7 @@@ W:      http://www.armlinux.org.uk
  
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <[email protected]>
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  R:    Konrad Dybcio <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -2633,7 -2589,6 +2633,7 @@@ F:      Documentation/devicetree/bindings/*/
  F:    Documentation/devicetree/bindings/soc/qcom/
  F:    arch/arm/boot/dts/qcom-*.dts
  F:    arch/arm/boot/dts/qcom-*.dtsi
 +F:    arch/arm/configs/qcom_defconfig
  F:    arch/arm/mach-qcom/
  F:    arch/arm64/boot/dts/qcom/
  F:    drivers/*/*/qcom*
@@@ -2696,7 -2651,7 +2696,7 @@@ F:      arch/arm/boot/dts/rtd
  F:    arch/arm/mach-realtek/
  F:    arch/arm64/boot/dts/realtek/
  
 -ARM/RENESAS ARM64 ARCHITECTURE
 +ARM/RENESAS ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
  M:    Magnus Damm <[email protected]>
  L:    [email protected]
@@@ -2707,16 -2662,6 +2707,16 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
  F:    Documentation/devicetree/bindings/soc/renesas/
 +F:    arch/arm/boot/dts/emev2*
 +F:    arch/arm/boot/dts/gr-peach*
 +F:    arch/arm/boot/dts/iwg20d-q7*
 +F:    arch/arm/boot/dts/r7s*
 +F:    arch/arm/boot/dts/r8a*
 +F:    arch/arm/boot/dts/r9a*
 +F:    arch/arm/boot/dts/sh*
 +F:    arch/arm/configs/shmobile_defconfig
 +F:    arch/arm/include/debug/renesas-scif.S
 +F:    arch/arm/mach-shmobile/
  F:    arch/arm64/boot/dts/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
@@@ -2726,6 -2671,7 +2726,6 @@@ M:      Russell King <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    http://www.armlinux.org.uk/
 -F:    arch/arm/include/asm/hardware/entry-macro-iomd.S
  F:    arch/arm/include/asm/hardware/ioc.h
  F:    arch/arm/include/asm/hardware/iomd.h
  F:    arch/arm/include/asm/hardware/memc.h
  S:    Maintained
  F:    drivers/media/platform/samsung/s5p-mfc/
  
 -ARM/SHMOBILE ARM ARCHITECTURE
 -M:    Geert Uytterhoeven <[email protected]>
 -M:    Magnus Damm <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
 -C:    irc://irc.libera.chat/renesas-soc
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
 -F:    Documentation/devicetree/bindings/arm/renesas.yaml
 -F:    Documentation/devicetree/bindings/soc/renesas/
 -F:    arch/arm/boot/dts/emev2*
 -F:    arch/arm/boot/dts/gr-peach*
 -F:    arch/arm/boot/dts/iwg20d-q7*
 -F:    arch/arm/boot/dts/r7s*
 -F:    arch/arm/boot/dts/r8a*
 -F:    arch/arm/boot/dts/r9a*
 -F:    arch/arm/boot/dts/sh*
 -F:    arch/arm/configs/shmobile_defconfig
 -F:    arch/arm/include/debug/renesas-scif.S
 -F:    arch/arm/mach-shmobile/
 -F:    drivers/soc/renesas/
 -F:    include/linux/soc/renesas/
 -
  ARM/SOCFPGA ARCHITECTURE
  M:    Dinh Nguyen <[email protected]>
  S:    Maintained
@@@ -3119,8 -3088,6 +3119,8 @@@ W:      http://wiki.xilinx.co
  T:    git https://github.com/Xilinx/linux-xlnx.git
  F:    Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
  F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
 +F:    Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml
  F:    Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/clocksource/timer-cadence-ttc.c
  S:    Maintained
  F:    drivers/hwmon/asus_wmi_sensors.c
  
 -ASUS WMI EC HARDWARE MONITOR DRIVER
 -M:    Eugene Shalygin <[email protected]>
 -M:    Denis Pauk <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/hwmon/asus_wmi_ec_sensors.c
 -
  ASUS EC HARDWARE MONITOR DRIVER
  M:    Eugene Shalygin <[email protected]>
  L:    [email protected]
@@@ -3852,7 -3826,6 +3852,7 @@@ F:      kernel/bpf/dispatcher.
  F:    kernel/bpf/trampoline.c
  F:    include/linux/bpf*
  F:    include/linux/filter.h
 +F:    include/linux/tnum.h
  
  BPF [BTF]
  M:    Martin KaFai Lau <[email protected]>
@@@ -3978,7 -3951,6 +3978,7 @@@ M:      William Zhang <william.zhang@broadco
  M:    Anand Gore <[email protected]>
  M:    Kursad Oney <[email protected]>
  M:    Florian Fainelli <[email protected]>
 +M:    Rafał Miłecki <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -4925,7 -4897,6 +4925,7 @@@ M:      Prashant Malani <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/chrome/cros_ec_typec.c
 +F:    drivers/platform/chrome/cros_typec_switch.c
  
  CHROMEOS EC USB PD NOTIFY DRIVER
  M:    Prashant Malani <[email protected]>
@@@ -5275,7 -5246,6 +5275,7 @@@ F:      block/blk-throttle.
  F:    include/linux/blk-cgroup.h
  
  CONTROL GROUP - CPUSET
 +M:    Waiman Long <[email protected]>
  M:    Zefan Li <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5404,8 -5374,8 +5404,8 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/cpuidle/cpuidle-big_little.c
  
  CPUIDLE DRIVER - ARM EXYNOS
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  M:    Daniel Lezcano <[email protected]>
 +R:    Krzysztof Kozlowski <[email protected]>
  M:    Kukjin Kim <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -5753,6 -5723,13 +5753,6 @@@ F:     include/linux/tfrc.
  F:    include/uapi/linux/dccp.h
  F:    net/dccp/
  
 -DECnet NETWORK LAYER
 -L:    [email protected]
 -S:    Orphan
 -W:    http://linux-decnet.sourceforge.net
 -F:    Documentation/networking/decnet.rst
 -F:    net/decnet/
 -
  DECSTATION PLATFORM SUPPORT
  M:    "Maciej W. Rozycki" <[email protected]>
  L:    [email protected]
@@@ -5921,9 -5898,10 +5921,9 @@@ T:     git git://git.kernel.org/pub/scm/lin
  F:    drivers/usb/dwc2/
  
  DESIGNWARE USB3 DRD IP DRIVER
 -M:    Felipe Balbi <[email protected]>
 +M:    Thinh Nguyen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  F:    drivers/usb/dwc3/
  
  DEVANTECH SRF ULTRASONIC RANGER IIO DRIVER
@@@ -6204,7 -6182,7 +6204,7 @@@ F:      Documentation/devicetree/bindings/me
  F:    drivers/memory/samsung/exynos5422-dmc.c
  
  DME1737 HARDWARE MONITOR DRIVER
 -M:    Juerg Haefliger <juergh@gmail.com>
 +M:    Juerg Haefliger <juergh@proton.me>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/dme1737.rst
@@@ -6444,11 -6422,6 +6444,11 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
  F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
 +DRM DRIVER FOR GENERIC EDP PANELS
 +R:    Douglas Anderson <[email protected]>
 +F:    Documentation/devicetree/bindings/display/panel/panel-edp.yaml
 +F:    drivers/gpu/drm/panel/panel-edp.c
 +
  DRM DRIVER FOR GENERIC USB DISPLAY
  M:    Noralf Trønnes <[email protected]>
  S:    Maintained
@@@ -7235,6 -7208,8 +7235,8 @@@ M:      Jason Baron <[email protected]
  S:    Maintained
  F:    include/linux/dynamic_debug.h
  F:    lib/dynamic_debug.c
+ M:    Jim Cromie <[email protected]>
+ F:    lib/test_dynamic_debug.c
  
  DYNAMIC INTERRUPT MODERATION
  M:    Tal Gilboa <[email protected]>
@@@ -7562,7 -7537,7 +7564,7 @@@ M:      Adrian Hunter <[email protected]
  M:    Ritesh Harjani <[email protected]>
  M:    Asutosh Das <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/mmc/host/cqhci*
  
  EMULEX 10Gbps iSCSI - OneConnect DRIVER
@@@ -7715,6 -7690,7 +7717,6 @@@ R:      Kees Cook <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
 -F:    arch/alpha/kernel/binfmt_loader.c
  F:    fs/*binfmt_*.c
  F:    fs/exec.c
  F:    include/linux/binfmts.h
@@@ -8031,7 -8007,6 +8033,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    include/linux/fortify-string.h
 +F:    lib/fortify_kunit.c
  F:    lib/test_fortify/*
  F:    scripts/test_fortify.sh
  K:    \b__NO_FORTIFY\b
@@@ -8474,6 -8449,7 +8476,6 @@@ F:      tools/testing/selftests/futex
  
  GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
  M:    Tim Harvey <[email protected]>
 -M:    Robert Jones <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
  F:    drivers/mfd/gateworks-gsc.c
@@@ -8934,7 -8910,7 +8936,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 -F:    drivers/staging/media/hantro/
 +F:    drivers/media/platform/verisilicon/
  
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <[email protected]>
@@@ -8970,7 -8946,7 +8972,7 @@@ F:      include/linux/hw_random.
  
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <[email protected]>
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  R:    Baolin Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
  S:    Supported
  F:    drivers/hid/hid-playstation.c
  
 +HID PHOENIX RC FLIGHT CONTROLLER
 +M:    Marcus Folkesson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-pxrc.c
 +
  HID SENSOR HUB DRIVERS
  M:    Jiri Kosina <[email protected]>
  M:    Jonathan Cameron <[email protected]>
@@@ -9098,12 -9068,6 +9100,12 @@@ F:    drivers/hid/hid-sensor-
  F:    drivers/iio/*/hid-*
  F:    include/linux/hid-sensor-*
  
 +HID VRC-2 CAR CONTROLLER DRIVER
 +M:    Marcus Folkesson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-vrc2.c
 +
  HID WACOM DRIVER
  M:    Ping Cheng <[email protected]>
  M:    Jason Gerecke  <[email protected]>
@@@ -9156,7 -9120,6 +9158,7 @@@ F:      net/dsa/tag_hellcreek.
  
  HISILICON DMA DRIVER
  M:    Zhou Wang <[email protected]>
 +M:    Jie Hai <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/dma/hisi_dma.c
@@@ -10418,6 -10381,7 +10420,6 @@@ INTEL MENLOW THERMAL DRIVE
  M:    Sujith Thomas <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linux-acpi
  F:    drivers/thermal/intel/intel_menlow.c
  
  INTEL P-Unit IPC DRIVER
@@@ -11112,8 -11076,8 +11114,8 @@@ F:   tools/testing/selftests
  KERNEL SMB3 SERVER (KSMBD)
  M:    Namjae Jeon <[email protected]>
  M:    Steve French <[email protected]>
 -M:    Hyunchul Lee <[email protected]>
  R:    Sergey Senozhatsky <[email protected]>
 +R:    Tom Talpey <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.samba.org/ksmbd.git
@@@ -11595,15 -11559,6 +11597,15 @@@ F: drivers/ata/ahci_platform.
  F:    drivers/ata/libahci_platform.c
  F:    include/linux/ahci_platform.h
  
 +LIBATA SATA AHCI SYNOPSYS DWC CONTROLLER DRIVER
 +M:    Serge Semin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
 +F:    Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml
 +F:    Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml
 +F:    drivers/ata/ahci_dwc.c
 +
  LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
  M:    Mikael Pettersson <[email protected]>
  L:    [email protected]
@@@ -12458,6 -12413,7 +12460,6 @@@ F:   drivers/power/supply/max77976_charge
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
  B:    mailto:[email protected]
@@@ -12469,6 -12425,7 +12471,6 @@@ F:   drivers/power/supply/max77693_charge
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
  B:    mailto:[email protected]
@@@ -13029,9 -12986,9 +13031,9 @@@ F:   drivers/input/touchscreen/melfas_mip
  
  MELLANOX BLUEFIELD I2C DRIVER
  M:    Khalil Blaiech <[email protected]>
 +M:    Asmaa Mnebhi <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.yaml
  F:    drivers/i2c/busses/i2c-mlxbf.c
  
  MELLANOX ETHERNET DRIVER (mlx4_en)
@@@ -13338,7 -13295,7 +13340,7 @@@ F:   include/dt-bindings/dma/at91.
  MICROCHIP AT91 SERIAL DRIVER
  M:    Richard Genoud <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
 +F:    Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
  F:    drivers/tty/serial/atmel_serial.c
  F:    drivers/tty/serial/atmel_serial.h
  
@@@ -13346,7 -13303,7 +13348,7 @@@ MICROCHIP AT91 USART MFD DRIVE
  M:    Radu Pirea <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
 +F:    Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
  F:    drivers/mfd/at91-usart.c
  F:    include/dt-bindings/mfd/at91-usart.h
  
@@@ -13354,7 -13311,7 +13356,7 @@@ MICROCHIP AT91 USART SPI DRIVE
  M:    Radu Pirea <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
 +F:    Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
  F:    drivers/spi/spi-at91-usart.c
  
  MICROCHIP AUDIO ASOC DRIVERS
@@@ -13480,14 -13437,6 +13482,14 @@@ F: Documentation/devicetree/bindings/nv
  F:    drivers/nvmem/microchip-otpc.c
  F:    include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
  
 +MICROCHIP PCI1XXXX I2C DRIVER
 +M:    Tharun Kumar P <[email protected]>
 +M:    Kumaravel Thiagarajan <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-mchp-pci1xxxx.c
 +
  MICROCHIP PWM DRIVER
  M:    Claudiu Beznea <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/mips/mscc.txt
 +F:    Documentation/devicetree/bindings/phy/mscc,vsc7514-serdes.yaml
  F:    Documentation/devicetree/bindings/power/reset/ocelot-reset.txt
  F:    arch/mips/boot/dts/mscc/
  F:    arch/mips/configs/generic/board-ocelot.config
@@@ -13835,7 -13783,7 +13837,7 @@@ MOTION EYE VAIO PICTUREBOOK CAMERA DRIV
  S:    Orphan
  W:    http://popies.net/meye/
  F:    Documentation/userspace-api/media/drivers/meye*
 -F:    drivers/media/pci/meye/
 +F:    drivers/staging/media/deprecated/meye/
  F:    include/uapi/linux/meye.h
  
  MOTORCOMM PHY DRIVER
@@@ -14504,7 -14452,6 +14506,7 @@@ M:   Willy Tarreau <[email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
  F:    tools/include/nolibc/
 +F:    tools/testing/selftests/nolibc/
  
  NSDEPS
  M:    Matthias Maennich <[email protected]>
@@@ -14587,7 -14534,6 +14589,7 @@@ M:   Daniel Dadap <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/platform/x86/nvidia-wmi-ec-backlight.c
 +F:    include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h
  
  NVM EXPRESS DRIVER
  M:    Keith Busch <[email protected]>
@@@ -14603,15 -14549,6 +14605,15 @@@ F: drivers/nvme/common
  F:    include/linux/nvme*
  F:    include/uapi/linux/nvme_ioctl.h
  
 +NVM EXPRESS FABRICS AUTHENTICATION
 +M:    Hannes Reinecke <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/nvme/host/auth.c
 +F:    drivers/nvme/target/auth.c
 +F:    drivers/nvme/target/fabrics-cmd-auth.c
 +F:    include/linux/nvme-auth.h
 +
  NVM EXPRESS FC TRANSPORT DRIVERS
  M:    James Smart <[email protected]>
  L:    [email protected]
@@@ -14761,15 -14698,6 +14763,15 @@@ S: Orpha
  F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
 +NXP i.MX 8MP DW100 V4L2 DRIVER
 +M:    Xavier Roumegue <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/nxp,dw100.yaml
 +F:    Documentation/userspace-api/media/drivers/dw100.rst
 +F:    drivers/media/platform/nxp/dw100/
 +F:    include/uapi/linux/dw100.h
 +
  NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
  M:    Mirela Rabulea <[email protected]>
  R:    NXP Linux Team <[email protected]>
@@@ -14821,13 -14749,6 +14823,13 @@@ F: net/dsa/tag_ocelot.
  F:    net/dsa/tag_ocelot_8021q.c
  F:    tools/testing/selftests/drivers/net/ocelot/*
  
 +OCELOT EXTERNAL SWITCH CONTROL
 +M:    Colin Foster <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml
 +F:    drivers/mfd/ocelot*
 +F:    include/linux/mfd/ocelot.h
 +
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
  M:    Frederic Barrat <[email protected]>
  M:    Andrew Donnellan <[email protected]>
@@@ -15022,7 -14943,6 +15024,7 @@@ F:   drivers/regulator/palmas-regulator*.
  F:    drivers/regulator/pbias-regulator.c
  F:    drivers/regulator/tps65217-regulator.c
  F:    drivers/regulator/tps65218-regulator.c
 +F:    drivers/regulator/tps65219-regulator.c
  F:    drivers/regulator/tps65910-regulator.c
  F:    drivers/regulator/twl-regulator.c
  F:    drivers/regulator/twl6030-regulator.c
@@@ -16208,7 -16128,7 +16210,7 @@@ F:   drivers/gpio/gpio-sama5d2-piobu.
  F:    drivers/pinctrl/pinctrl-at91*
  
  PIN CONTROLLER - QUALCOMM
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/qcom,*.txt
@@@ -16621,6 -16541,14 +16623,6 @@@ T:  git git://linuxtv.org/media_tree.gi
  F:    drivers/media/usb/pwc/*
  F:    include/trace/events/pwc.h
  
 -PWM FAN DRIVER
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
 -F:    Documentation/hwmon/pwm-fan.rst
 -F:    drivers/hwmon/pwm-fan.c
 -
  PWM IR Transmitter
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -16689,9 -16617,6 +16691,9 @@@ M:   Srinivas Kandagatla <srinivas.kandag
  M:    Banajit Goswami <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml
 +F:    Documentation/devicetree/bindings/sound/qcom,*
 +F:    drivers/soc/qcom/apr.c
  F:    include/dt-bindings/sound/qcom,wcd9335.h
  F:    sound/soc/codecs/lpass-rx-macro.*
  F:    sound/soc/codecs/lpass-tx-macro.*
@@@ -16896,7 -16821,7 +16898,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CLOCK DRIVERS
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -17386,7 -17311,7 +17388,7 @@@ S:   Supporte
  F:    fs/reiserfs/
  
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  M:    Mathieu Poirier <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17399,7 -17324,7 +17401,7 @@@ F:   include/linux/remoteproc.
  F:    include/linux/remoteproc/
  
  REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  M:    Mathieu Poirier <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17628,7 -17553,6 +17630,7 @@@ F:   drivers/mailbox/mailbox-mpfs.
  F:    drivers/pci/controller/pcie-microchip-host.c
  F:    drivers/rtc/rtc-mpfs.c
  F:    drivers/soc/microchip/
 +F:    drivers/spi/spi-microchip-core-qspi.c
  F:    drivers/spi/spi-microchip-core.c
  F:    drivers/usb/musb/mpfs.c
  F:    include/soc/microchip/mpfs.h
@@@ -17836,24 -17760,6 +17838,24 @@@ F: include/rv
  F:    kernel/trace/rv/
  F:    tools/verification/
  
 +RUST
 +M:    Miguel Ojeda <[email protected]>
 +M:    Alex Gaynor <[email protected]>
 +M:    Wedson Almeida Filho <[email protected]>
 +R:    Boqun Feng <[email protected]>
 +R:    Gary Guo <[email protected]>
 +R:    Björn Roy Baron <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://github.com/Rust-for-Linux/linux
 +B:    https://github.com/Rust-for-Linux/linux/issues
 +T:    git https://github.com/Rust-for-Linux/linux.git rust-next
 +F:    Documentation/rust/
 +F:    rust/
 +F:    samples/rust/
 +F:    scripts/*rust*
 +K:    \b(?i:rust)\b
 +
  RXRPC SOCKETS (AF_RXRPC)
  M:    David Howells <[email protected]>
  M:    Marc Dionne <[email protected]>
@@@ -18025,7 -17931,8 +18027,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/common/saa7146/
 -F:    drivers/media/pci/saa7146/
 +F:    drivers/staging/media/deprecated/saa7146/
  F:    include/media/drv-intf/saa7146*
  
  SAFESETID SECURITY MODULE
@@@ -18080,6 -17987,7 +18082,6 @@@ F:   drivers/platform/x86/samsung-laptop.
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -18374,7 -18282,7 +18376,7 @@@ F:   drivers/mmc/host/sdhci-brcmstb
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  M:    Adrian Hunter <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/mmc/host/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
@@@ -18397,7 -18305,7 +18399,7 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdhci-spear.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) TI OMAP DRIVER
 -M:    Kishon Vijay Abraham I <kishon@ti.com>
 +M:    Vignesh Raghavendra <vigneshr@ti.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-omap.c
  S:    Maintained
  F:    drivers/net/ethernet/dlink/sundance.c
  
 +SUN HAPPY MEAL ETHERNET DRIVER
 +M:    Sean Anderson <[email protected]>
 +S:    Maintained
 +F:    drivers/net/ethernet/sun/sunhme.*
 +
  SUNPLUS ETHERNET DRIVER
  M:    Wells Lu <[email protected]>
  L:    [email protected]
@@@ -19617,15 -19520,6 +19619,15 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
  F:    drivers/nvmem/sunplus-ocotp.c
  
 +SUNPLUS USB2 PHY DRIVER
 +M:    Vincent Shih <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml
 +F:    drivers/phy/sunplus/Kconfig
 +F:    drivers/phy/sunplus/Makefile
 +F:    drivers/phy/sunplus/phy-sunplus-usb2.c
 +
  SUNPLUS PWM DRIVER
  M:    Hammer Hsieh <[email protected]>
  S:    Maintained
@@@ -20069,7 -19963,7 +20071,7 @@@ S:   Supporte
  F:    drivers/net/team/
  F:    include/linux/if_team.h
  F:    include/uapi/linux/if_team.h
 -F:    tools/testing/selftests/net/team/
 +F:    tools/testing/selftests/drivers/net/team/
  
  TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
  M:    "Savoir-faire Linux Inc." <[email protected]>
@@@ -20457,7 -20351,6 +20459,7 @@@ W:   https://linuxtv.or
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  F:    drivers/media/platform/ti/davinci/
 +F:    drivers/staging/media/deprecated/vpfe_capture/
  F:    include/media/davinci/
  
  TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
@@@ -20598,7 -20491,7 +20600,7 @@@ S:   Odd fixe
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/tm6000*
 -F:    drivers/media/usb/tm6000/
 +F:    drivers/staging/media/deprecated/tm6000/
  
  TMIO/SDHI MMC DRIVER
  M:    Wolfram Sang <[email protected]>
@@@ -20698,10 -20591,9 +20700,10 @@@ F: include/linux/toshiba.
  F:    include/uapi/linux/toshiba.h
  
  TOSHIBA TC358743 DRIVER
 -M:    Mats Randgaard <[email protected]>
 +M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/tc358743.txt
  F:    drivers/media/i2c/tc358743*
  F:    include/media/i2c/tc358743.h
  
@@@ -20722,13 -20614,6 +20724,13 @@@ Q: https://patchwork.kernel.org/project
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
  F:    drivers/char/tpm/
  
 +TPS546D24 DRIVER
 +M:    Duke Du <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/tps546d24.rst
 +F:    drivers/hwmon/pmbus/tps546d24.c
 +
  TRACING
  M:    Steven Rostedt <[email protected]>
  M:    Ingo Molnar <[email protected]>
@@@ -21357,7 -21242,7 +21359,7 @@@ S:   Maintaine
  W:    http://royale.zerezo.com/zr364xx/
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/zr364xx*
 -F:    drivers/media/usb/zr364xx/
 +F:    drivers/staging/media/deprecated/zr364xx/
  
  USER-MODE LINUX (UML)
  M:    Richard Weinberger <[email protected]>
@@@ -21932,7 -21817,7 +21934,7 @@@ F:   lib/test_scanf.
  F:    lib/vsprintf.c
  
  VT1211 HARDWARE MONITOR DRIVER
 -M:    Juerg Haefliger <juergh@gmail.com>
 +M:    Juerg Haefliger <juergh@proton.me>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/vt1211.rst
@@@ -21991,11 -21876,9 +21993,11 @@@ F: drivers/input/tablet/wacom_serial4.
  
  WANGXUN ETHERNET DRIVER
  M:    Jiawen Wu <[email protected]>
 +M:    Mengyuan Lou <[email protected]>
 +W:    https://www.net-swift.com
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst
 +F:    Documentation/networking/device_drivers/ethernet/wangxun/*
  F:    drivers/net/ethernet/wangxun/
  
  WATCHDOG DEVICE DRIVERS
diff --combined drivers/block/nbd.c
index 4762a03e1ffe8d068a2833644ea047b3f83f466e,e185d7b5f1e8d053c6c1fd6f1965b04414c22ce0..5cffd96ef2d7decd29600be8618c8670fdaf2ddf
@@@ -157,8 -157,6 +157,6 @@@ static struct dentry *nbd_dbg_dir
  
  #define nbd_name(nbd) ((nbd)->disk->disk_name)
  
- #define NBD_MAGIC 0x68797548
  #define NBD_DEF_BLKSIZE_BITS 10
  
  static unsigned int nbds_max = 16;
@@@ -1413,12 -1411,10 +1411,12 @@@ static int nbd_start_device_ioctl(struc
        mutex_unlock(&nbd->config_lock);
        ret = wait_event_interruptible(config->recv_wq,
                                         atomic_read(&config->recv_threads) == 0);
 -      if (ret)
 +      if (ret) {
                sock_shutdown(nbd);
 -      flush_workqueue(nbd->recv_workq);
 +              nbd_clear_que(nbd);
 +      }
  
 +      flush_workqueue(nbd->recv_workq);
        mutex_lock(&nbd->config_lock);
        nbd_bdev_reset(nbd);
        /* user requested, ignore socket errors */
@@@ -2324,7 -2320,6 +2322,7 @@@ static struct genl_family nbd_genl_fami
        .module         = THIS_MODULE,
        .small_ops      = nbd_connect_genl_ops,
        .n_small_ops    = ARRAY_SIZE(nbd_connect_genl_ops),
 +      .resv_start_op  = NBD_CMD_STATUS + 1,
        .maxattr        = NBD_ATTR_MAX,
        .policy = nbd_attr_policy,
        .mcgrps         = nbd_mcast_grps,
diff --combined drivers/gpu/drm/Kconfig
index 198ba846d34bf7b5f2c143a9b443ef912354852d,2438e0dccfa16765705404d9d0fee5ca8a56463a..34f5a092c99e72f3a3b8744fa5b71f80de96e9b6
@@@ -31,7 -31,6 +31,7 @@@ menuconfig DR
  config DRM_MIPI_DBI
        tristate
        depends on DRM
 +      select DRM_KMS_HELPER
  
  config DRM_MIPI_DSI
        bool
@@@ -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
        select DRM_KMS_HELPER
        select DRM_BUDDY
        select DRM_EXPORT_FOR_TESTS if m
 -      default n
 -      help
 -        This option provides kernel modules that can be used to run
 -        various selftests on parts of the DRM api. This option is not
 -        useful for distributions or general kernels, but only for kernel
 -        developers working on DRM and associated drivers.
 -
 -        If in doubt, say "N".
 -
 -config DRM_KUNIT_TEST
 -      tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS
 -      depends on DRM && KUNIT=y
 -      select DRM_KMS_HELPER
        default KUNIT_ALL_TESTS
        help
          This builds unit tests for DRM. This option is not useful for
@@@ -201,11 -226,11 +213,11 @@@ config DRM_TTM_HELPE
        help
          Helpers for ttm-based gem objects
  
 -config DRM_GEM_CMA_HELPER
 +config DRM_GEM_DMA_HELPER
        tristate
        depends on DRM
        help
 -        Choose this if you need the GEM CMA helper functions
 +        Choose this if you need the GEM DMA helper functions
  
  config DRM_GEM_SHMEM_HELPER
        tristate
@@@ -235,13 -260,6 +247,13 @@@ config DRM_RADEO
        select HWMON
        select BACKLIGHT_CLASS_DEVICE
        select INTERVAL_TREE
 +      # radeon depends on ACPI_VIDEO when ACPI is enabled, for select to work
 +      # ACPI_VIDEO's dependencies must also be selected.
 +      select INPUT if ACPI
 +      select ACPI_VIDEO if ACPI
 +      # On x86 ACPI_VIDEO also needs ACPI_WMI
 +      select X86_PLATFORM_DEVICES if ACPI && X86
 +      select ACPI_WMI if ACPI && X86
        help
          Choose this option if you have an ATI Radeon graphics card.  There
          are both PCI and AGP versions.  You don't need to choose this to
@@@ -267,13 -285,6 +279,13 @@@ config DRM_AMDGP
        select BACKLIGHT_CLASS_DEVICE
        select INTERVAL_TREE
        select DRM_BUDDY
 +      # amdgpu depends on ACPI_VIDEO when ACPI is enabled, for select to work
 +      # ACPI_VIDEO's dependencies must also be selected.
 +      select INPUT if ACPI
 +      select ACPI_VIDEO if ACPI
 +      # On x86 ACPI_VIDEO also needs ACPI_WMI
 +      select X86_PLATFORM_DEVICES if ACPI && X86
 +      select ACPI_WMI if ACPI && X86
        help
          Choose this option if you have a recent AMD Radeon graphics card.
  
diff --combined drivers/gpu/drm/Makefile
index 25d0ba31050938c0db4b76369ac894a59b40936c,6828197967a6f5c05e3583c74818d960e530e01b..0b283e46f28b89ef4b2083bb34106b165f1ad09b
@@@ -3,6 -3,8 +3,8 @@@
  # Makefile for the drm device driver.  This driver provides support for the
  # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
  
+ CFLAGS-$(CONFIG_DRM_USE_DYNAMIC_DEBUG)        += -DDYNAMIC_DEBUG_MODULE
  drm-y       :=        drm_aperture.o drm_auth.o drm_cache.o \
                drm_file.o drm_gem.o drm_ioctl.o \
                drm_drv.o \
@@@ -40,9 -42,9 +42,9 @@@ obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIR
  
  obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o
  
 -drm_cma_helper-y := drm_gem_cma_helper.o
 -drm_cma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_cma_helper.o
 -obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o
 +drm_dma_helper-y := drm_gem_dma_helper.o
 +drm_dma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_dma_helper.o
 +obj-$(CONFIG_DRM_GEM_DMA_HELPER) += drm_dma_helper.o
  
  drm_shmem_helper-y := drm_gem_shmem_helper.o
  obj-$(CONFIG_DRM_GEM_SHMEM_HELPER) += drm_shmem_helper.o
@@@ -75,6 -77,7 +77,6 @@@ obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms
  # Drivers and the rest
  #
  
 -obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/
  obj-$(CONFIG_DRM_KUNIT_TEST) += tests/
  
  obj-$(CONFIG_DRM_MIPI_DBI) += drm_mipi_dbi.o
index 16f6a313335e91997fa480fd1443dd2aeea5a883,5f091cb52de203e45b8bf16c0799e0ae759cf198..3c9fecdd6b2f322fc7f1dbbb28aecf91739c84f6
@@@ -38,6 -38,8 +38,8 @@@
  #include <linux/mmu_notifier.h>
  #include <linux/suspend.h>
  #include <linux/cc_platform.h>
+ #include <linux/fb.h>
+ #include <linux/dynamic_debug.h>
  
  #include "amdgpu.h"
  #include "amdgpu_irq.h"
   * - 3.46.0 - To enable hot plug amdgpu tests in libdrm
   * - 3.47.0 - Add AMDGPU_GEM_CREATE_DISCARDABLE and AMDGPU_VM_NOALLOC flags
   * - 3.48.0 - Add IP discovery version info to HW INFO
 + *   3.49.0 - Add gang submit into CS IOCTL
   */
  #define KMS_DRIVER_MAJOR      3
 -#define KMS_DRIVER_MINOR      48
 +#define KMS_DRIVER_MINOR      49
  #define KMS_DRIVER_PATCHLEVEL 0
  
  int amdgpu_vram_limit;
@@@ -186,6 -187,18 +188,18 @@@ int amdgpu_vcnfw_log
  
  static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work);
  
+ DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0,
+                       "DRM_UT_CORE",
+                       "DRM_UT_DRIVER",
+                       "DRM_UT_KMS",
+                       "DRM_UT_PRIME",
+                       "DRM_UT_ATOMIC",
+                       "DRM_UT_VBL",
+                       "DRM_UT_STATE",
+                       "DRM_UT_LEASE",
+                       "DRM_UT_DP",
+                       "DRM_UT_DRMRES");
  struct amdgpu_mgpu_info mgpu_info = {
        .mutex = __MUTEX_INITIALIZER(mgpu_info.mutex),
        .delayed_reset_work = __DELAYED_WORK_INITIALIZER(
@@@ -2182,46 -2195,15 +2196,46 @@@ amdgpu_pci_remove(struct pci_dev *pdev
        struct drm_device *dev = pci_get_drvdata(pdev);
        struct amdgpu_device *adev = drm_to_adev(dev);
  
 -      drm_dev_unplug(dev);
 -
        if (adev->pm.rpm_mode != AMDGPU_RUNPM_NONE) {
                pm_runtime_get_sync(dev->dev);
                pm_runtime_forbid(dev->dev);
        }
  
 +      if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2)) {
 +              bool need_to_reset_gpu = false;
 +
 +              if (adev->gmc.xgmi.num_physical_nodes > 1) {
 +                      struct amdgpu_hive_info *hive;
 +
 +                      hive = amdgpu_get_xgmi_hive(adev);
 +                      if (hive->device_remove_count == 0)
 +                              need_to_reset_gpu = true;
 +                      hive->device_remove_count++;
 +                      amdgpu_put_xgmi_hive(hive);
 +              } else {
 +                      need_to_reset_gpu = true;
 +              }
 +
 +              /* Workaround for ASICs need to reset SMU.
 +               * Called only when the first device is removed.
 +               */
 +              if (need_to_reset_gpu) {
 +                      struct amdgpu_reset_context reset_context;
 +
 +                      adev->shutdown = true;
 +                      memset(&reset_context, 0, sizeof(reset_context));
 +                      reset_context.method = AMD_RESET_METHOD_NONE;
 +                      reset_context.reset_req_dev = adev;
 +                      set_bit(AMDGPU_NEED_FULL_RESET, &reset_context.flags);
 +                      set_bit(AMDGPU_RESET_FOR_DEVICE_REMOVE, &reset_context.flags);
 +                      amdgpu_device_gpu_recover(adev, NULL, &reset_context);
 +              }
 +      }
 +
        amdgpu_driver_unload_kms(dev);
  
 +      drm_dev_unplug(dev);
 +
        /*
         * Flush any in flight DMA operations from device.
         * Clear the Bus Master Enable bit and then wait on the PCIe Device
@@@ -2595,11 -2577,8 +2609,11 @@@ static int amdgpu_pmops_runtime_resume(
                amdgpu_device_baco_exit(drm_dev);
        }
        ret = amdgpu_device_resume(drm_dev, false);
 -      if (ret)
 +      if (ret) {
 +              if (amdgpu_device_supports_px(drm_dev))
 +                      pci_disable_device(pdev);
                return ret;
 +      }
  
        if (amdgpu_device_supports_px(drm_dev))
                drm_dev->switch_power_state = DRM_SWITCH_POWER_ON;
index 9f055d9710eab91b63ec42f10d334ec380c169ad,196dfb1e8d87763877cc8083c8d0a1800176f14d..16565a0a5da6d98d1001cfd3acb9cd547e73b105
@@@ -30,6 -30,7 +30,7 @@@
  #include <linux/sched.h>
  #include <linux/seq_file.h>
  #include <linux/string_helpers.h>
+ #include <linux/dynamic_debug.h>
  
  #include <drm/display/drm_dp_helper.h>
  #include <drm/display/drm_dp_mst_helper.h>
  
  #include "drm_dp_helper_internal.h"
  
+ DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0,
+                       "DRM_UT_CORE",
+                       "DRM_UT_DRIVER",
+                       "DRM_UT_KMS",
+                       "DRM_UT_PRIME",
+                       "DRM_UT_ATOMIC",
+                       "DRM_UT_VBL",
+                       "DRM_UT_STATE",
+                       "DRM_UT_LEASE",
+                       "DRM_UT_DP",
+                       "DRM_UT_DRMRES");
  struct dp_aux_backlight {
        struct backlight_device *base;
        struct drm_dp_aux *aux;
@@@ -390,38 -403,6 +403,38 @@@ void drm_dp_link_train_channel_eq_delay
  }
  EXPORT_SYMBOL(drm_dp_link_train_channel_eq_delay);
  
 +/**
 + * drm_dp_phy_name() - Get the name of the given DP PHY
 + * @dp_phy: The DP PHY identifier
 + *
 + * Given the @dp_phy, get a user friendly name of the DP PHY, either "DPRX" or
 + * "LTTPR <N>", or "<INVALID DP PHY>" on errors. The returned string is always
 + * non-NULL and valid.
 + *
 + * Returns: Name of the DP PHY.
 + */
 +const char *drm_dp_phy_name(enum drm_dp_phy dp_phy)
 +{
 +      static const char * const phy_names[] = {
 +              [DP_PHY_DPRX] = "DPRX",
 +              [DP_PHY_LTTPR1] = "LTTPR 1",
 +              [DP_PHY_LTTPR2] = "LTTPR 2",
 +              [DP_PHY_LTTPR3] = "LTTPR 3",
 +              [DP_PHY_LTTPR4] = "LTTPR 4",
 +              [DP_PHY_LTTPR5] = "LTTPR 5",
 +              [DP_PHY_LTTPR6] = "LTTPR 6",
 +              [DP_PHY_LTTPR7] = "LTTPR 7",
 +              [DP_PHY_LTTPR8] = "LTTPR 8",
 +      };
 +
 +      if (dp_phy < 0 || dp_phy >= ARRAY_SIZE(phy_names) ||
 +          WARN_ON(!phy_names[dp_phy]))
 +              return "<INVALID DP PHY>";
 +
 +      return phy_names[dp_phy];
 +}
 +EXPORT_SYMBOL(drm_dp_phy_name);
 +
  void drm_dp_lttpr_link_train_clock_recovery_delay(void)
  {
        usleep_range(100, 200);
@@@ -1629,7 -1610,7 +1642,7 @@@ static int drm_dp_aux_reply_duration(co
  
  /*
   * Calculate the length of the i2c transfer in usec, assuming
 - * the i2c bus speed is as specified. Gives the the "worst"
 + * the i2c bus speed is as specified. Gives the "worst"
   * case estimate, ie. successful while as long as possible.
   * Doesn't account the "MOT" bit, and instead assumes each
   * message includes a START, ADDRESS and STOP. Neither does it
@@@ -2670,8 -2651,17 +2683,8 @@@ int drm_dp_set_phy_test_pattern(struct 
                                struct drm_dp_phy_test_params *data, u8 dp_rev)
  {
        int err, i;
 -      u8 link_config[2];
        u8 test_pattern;
  
 -      link_config[0] = drm_dp_link_rate_to_bw_code(data->link_rate);
 -      link_config[1] = data->num_lanes;
 -      if (data->enhanced_frame_cap)
 -              link_config[1] |= DP_LANE_COUNT_ENHANCED_FRAME_EN;
 -      err = drm_dp_dpcd_write(aux, DP_LINK_BW_SET, link_config, 2);
 -      if (err < 0)
 -              return err;
 -
        test_pattern = data->phy_pattern;
        if (dp_rev < 0x12) {
                test_pattern = (test_pattern << 2) &
index 457448cc60f70e40418aebde128e74c1aed6d5b3,a8cee6694cf6f1612041d5a2a4936e9c35dd60ba..7d86020b5244a4ab913ebc659c2707e6ec6c0ad8
@@@ -32,6 -32,7 +32,7 @@@
  #include <linux/export.h>
  #include <linux/kernel.h>
  #include <linux/moduleparam.h>
+ #include <linux/dynamic_debug.h>
  
  #include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_fb_helper.h>
  #include <drm/drm_fourcc.h>
  #include <drm/drm_framebuffer.h>
 -#include <drm/drm_plane_helper.h>
  #include <drm/drm_print.h>
  #include <drm/drm_vblank.h>
  
  #include "drm_crtc_helper_internal.h"
  
+ DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0,
+                       "DRM_UT_CORE",
+                       "DRM_UT_DRIVER",
+                       "DRM_UT_KMS",
+                       "DRM_UT_PRIME",
+                       "DRM_UT_ATOMIC",
+                       "DRM_UT_VBL",
+                       "DRM_UT_STATE",
+                       "DRM_UT_LEASE",
+                       "DRM_UT_DP",
+                       "DRM_UT_DRMRES");
  /**
   * DOC: overview
   *
index a232f518d98a29cc4ef1c4ea143a87a4e2939a73,9b8bd5504ad9e13319839f38d34f5546f04df1fb..c15de165ec8ff0df147f0f91f67947e3ebc54aaf
  #define MEM_DISCARD(sec) *(.mem##sec)
  #endif
  
 +#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_NO_PATCHABLE
 +#define KEEP_PATCHABLE                KEEP(*(__patchable_function_entries))
 +#define PATCHABLE_DISCARDS
 +#else
 +#define KEEP_PATCHABLE
 +#define PATCHABLE_DISCARDS    *(__patchable_function_entries)
 +#endif
 +
  #ifdef CONFIG_FTRACE_MCOUNT_RECORD
  /*
   * The ftrace call sites are logged to a section whose name depends on the
  #define MCOUNT_REC()  . = ALIGN(8);                           \
                        __start_mcount_loc = .;                 \
                        KEEP(*(__mcount_loc))                   \
 -                      KEEP(*(__patchable_function_entries))   \
 +                      KEEP_PATCHABLE                          \
                        __stop_mcount_loc = .;                  \
                        ftrace_stub_graph = ftrace_stub;        \
                        ftrace_ops_list_func = arch_ftrace_ops_list_func;
        *(__tracepoints)                                                \
        /* implement dynamic printk debug */                            \
        . = ALIGN(8);                                                   \
+       __start___dyndbg_classes = .;                                   \
+       KEEP(*(__dyndbg_classes))                                       \
+       __stop___dyndbg_classes = .;                                    \
        __start___dyndbg = .;                                           \
        KEEP(*(__dyndbg))                                               \
        __stop___dyndbg = .;                                            \
        __end_ro_after_init = .;
  #endif
  
 +/*
 + * .kcfi_traps contains a list KCFI trap locations.
 + */
 +#ifndef KCFI_TRAPS
 +#ifdef CONFIG_ARCH_USES_CFI_TRAPS
 +#define KCFI_TRAPS                                                    \
 +      __kcfi_traps : AT(ADDR(__kcfi_traps) - LOAD_OFFSET) {           \
 +              __start___kcfi_traps = .;                               \
 +              KEEP(*(.kcfi_traps))                                    \
 +              __stop___kcfi_traps = .;                                \
 +      }
 +#else
 +#define KCFI_TRAPS
 +#endif
 +#endif
 +
  /*
   * Read only Data
   */
                __stop___modver = .;                                    \
        }                                                               \
                                                                        \
 +      KCFI_TRAPS                                                      \
 +                                                                      \
        RO_EXCEPTION_TABLE                                              \
        NOTES                                                           \
        BTF                                                             \
        __end_rodata = .;
  
  
 -/*
 - * .text..L.cfi.jumptable.* contain Control-Flow Integrity (CFI)
 - * jump table entries.
 - */
 -#ifdef CONFIG_CFI_CLANG
 -#define TEXT_CFI_JT                                                   \
 -              . = ALIGN(PMD_SIZE);                                    \
 -              __cfi_jt_start = .;                                     \
 -              *(.text..L.cfi.jumptable .text..L.cfi.jumptable.*)      \
 -              . = ALIGN(PMD_SIZE);                                    \
 -              __cfi_jt_end = .;
 -#else
 -#define TEXT_CFI_JT
 -#endif
 -
  /*
   * Non-instrumentable text section
   */
                *(.text..refcount)                                      \
                *(.ref.text)                                            \
                *(.text.asan.* .text.tsan.*)                            \
 -              TEXT_CFI_JT                                             \
        MEM_KEEP(init.text*)                                            \
        MEM_KEEP(exit.text*)                                            \
  
   * keep any .init_array.* sections.
   * https://bugs.llvm.org/show_bug.cgi?id=46478
   */
 -#if defined(CONFIG_GCOV_KERNEL) || defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KCSAN) || \
 -      defined(CONFIG_CFI_CLANG)
 +#if defined(CONFIG_GCOV_KERNEL) || defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KCSAN)
  # ifdef CONFIG_CONSTRUCTORS
  #  define SANITIZER_DISCARDS                                          \
        *(.eh_frame)
  
  #define COMMON_DISCARDS                                                       \
        SANITIZER_DISCARDS                                              \
 +      PATCHABLE_DISCARDS                                              \
        *(.discard)                                                     \
        *(.discard.*)                                                   \
        *(.modinfo)                                                     \
diff --combined kernel/cgroup/cgroup.c
index 8ad2c267ff471004f30b662a5576ee3e4921c105,718a70c01c0450c94406e023e779f29636d6709d..b6e3110b3ea76611f55f5ead0fe2f28faf815876
@@@ -4371,6 -4371,26 +4371,26 @@@ void cgroup_file_notify(struct cgroup_f
        spin_unlock_irqrestore(&cgroup_file_kn_lock, flags);
  }
  
+ /**
+  * cgroup_file_show - show or hide a hidden cgroup file
+  * @cfile: target cgroup_file obtained by setting cftype->file_offset
+  * @show: whether to show or hide
+  */
+ void cgroup_file_show(struct cgroup_file *cfile, bool show)
+ {
+       struct kernfs_node *kn;
+       spin_lock_irq(&cgroup_file_kn_lock);
+       kn = cfile->kn;
+       kernfs_get(kn);
+       spin_unlock_irq(&cgroup_file_kn_lock);
+       if (kn)
+               kernfs_show(kn, show);
+       kernfs_put(kn);
+ }
  /**
   * css_next_child - find the next child of a given css
   * @pos: the current position (%NULL to initiate traversal)
@@@ -6049,9 -6069,6 +6069,9 @@@ struct cgroup *cgroup_get_from_id(u64 i
        if (!kn)
                goto out;
  
 +      if (kernfs_type(kn) != KERNFS_DIR)
 +              goto put;
 +
        rcu_read_lock();
  
        cgrp = rcu_dereference(*(void __rcu __force **)&kn->priv);
                cgrp = NULL;
  
        rcu_read_unlock();
 -
 +put:
        kernfs_put(kn);
  out:
        return cgrp;
@@@ -6167,6 -6184,11 +6187,6 @@@ static struct cgroup *cgroup_get_from_f
                return ERR_CAST(css);
  
        cgrp = css->cgroup;
 -      if (!cgroup_on_dfl(cgrp)) {
 -              cgroup_put(cgrp);
 -              return ERR_PTR(-EBADF);
 -      }
 -
        return cgrp;
  }
  
diff --combined kernel/module/main.c
index 70c0b2c6fef8c6ecd6552032755fa942030a42b7,6aa6153aa6e0b00f05bc46a2977de01a90579189..d02d39c7174e141b06a5e766cfa8553a47c6833e
@@@ -53,7 -53,6 +53,7 @@@
  #include <linux/bsearch.h>
  #include <linux/dynamic_debug.h>
  #include <linux/audit.h>
 +#include <linux/cfi.h>
  #include <uapi/linux/module.h>
  #include "internal.h"
  
@@@ -1145,6 -1144,8 +1145,6 @@@ void __weak module_arch_freeing_init(st
  {
  }
  
 -static void cfi_cleanup(struct module *mod);
 -
  /* Free a module, remove from lists, etc. */
  static void free_module(struct module *mod)
  {
                       mod->name);
        mutex_unlock(&module_mutex);
  
 -      /* Clean up CFI for the module. */
 -      cfi_cleanup(mod);
 -
        /* This may be empty, but that's OK */
        module_arch_freeing_init(mod);
        module_memfree(mod->init_layout.base);
@@@ -1594,16 -1598,16 +1594,16 @@@ static void free_modinfo(struct module 
        }
  }
  
- static void dynamic_debug_setup(struct module *mod, struct _ddebug *debug, unsigned int num)
+ static void dynamic_debug_setup(struct module *mod, struct _ddebug_info *dyndbg)
  {
-       if (!debug)
+       if (!dyndbg->num_descs)
                return;
-       ddebug_add_module(debug, num, mod->name);
+       ddebug_add_module(dyndbg, mod->name);
  }
  
- static void dynamic_debug_remove(struct module *mod, struct _ddebug *debug)
+ static void dynamic_debug_remove(struct module *mod, struct _ddebug_info *dyndbg)
  {
-       if (debug)
+       if (dyndbg->num_descs)
                ddebug_remove_module(mod->name);
  }
  
@@@ -2107,8 -2111,10 +2107,10 @@@ static int find_module_sections(struct 
        if (section_addr(info, "__obsparm"))
                pr_warn("%s: Ignoring obsolete parameters\n", mod->name);
  
-       info->debug = section_objs(info, "__dyndbg",
-                                  sizeof(*info->debug), &info->num_debug);
+       info->dyndbg.descs = section_objs(info, "__dyndbg",
+                                       sizeof(*info->dyndbg.descs), &info->dyndbg.num_descs);
+       info->dyndbg.classes = section_objs(info, "__dyndbg_classes",
+                                       sizeof(*info->dyndbg.classes), &info->dyndbg.num_classes);
  
        return 0;
  }
@@@ -2598,9 -2604,8 +2600,9 @@@ static int complete_formation(struct mo
        if (err < 0)
                goto out;
  
 -      /* This relies on module_mutex for list integrity. */
 +      /* These rely on module_mutex for list integrity. */
        module_bug_finalize(info->hdr, info->sechdrs, mod);
 +      module_cfi_finalize(info->hdr, info->sechdrs, mod);
  
        if (module_check_misalignment(mod))
                goto out_misaligned;
@@@ -2662,6 -2667,8 +2664,6 @@@ static int unknown_module_param_cb(cha
        return 0;
  }
  
 -static void cfi_init(struct module *mod);
 -
  /*
   * Allocate and load the module: note that size of section 0 is always
   * zero, and we rely on this for optional sections.
@@@ -2791,6 -2798,9 +2793,6 @@@ static int load_module(struct load_inf
  
        flush_module_icache(mod);
  
 -      /* Setup CFI for the module. */
 -      cfi_init(mod);
 -
        /* Now copy in args */
        mod->args = strndup_user(uargs, ~0UL >> 1);
        if (IS_ERR(mod->args)) {
        }
  
        init_build_id(mod, info);
-       dynamic_debug_setup(mod, info->debug, info->num_debug);
+       dynamic_debug_setup(mod, &info->dyndbg);
  
        /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
        ftrace_module_init(mod);
  
   ddebug_cleanup:
        ftrace_release_mod(mod);
-       dynamic_debug_remove(mod, info->debug);
+       dynamic_debug_remove(mod, &info->dyndbg);
        synchronize_rcu();
        kfree(mod->args);
   free_arch_cleanup:
 -      cfi_cleanup(mod);
        module_arch_cleanup(mod);
   free_modinfo:
        free_modinfo(mod);
@@@ -2952,6 -2963,41 +2954,6 @@@ static inline int within(unsigned long 
        return ((void *)addr >= start && (void *)addr < start + size);
  }
  
 -static void cfi_init(struct module *mod)
 -{
 -#ifdef CONFIG_CFI_CLANG
 -      initcall_t *init;
 -#ifdef CONFIG_MODULE_UNLOAD
 -      exitcall_t *exit;
 -#endif
 -
 -      rcu_read_lock_sched();
 -      mod->cfi_check = (cfi_check_fn)
 -              find_kallsyms_symbol_value(mod, "__cfi_check");
 -      init = (initcall_t *)
 -              find_kallsyms_symbol_value(mod, "__cfi_jt_init_module");
 -      /* Fix init/exit functions to point to the CFI jump table */
 -      if (init)
 -              mod->init = *init;
 -#ifdef CONFIG_MODULE_UNLOAD
 -      exit = (exitcall_t *)
 -              find_kallsyms_symbol_value(mod, "__cfi_jt_cleanup_module");
 -      if (exit)
 -              mod->exit = *exit;
 -#endif
 -      rcu_read_unlock_sched();
 -
 -      cfi_module_add(mod, mod_tree.addr_min);
 -#endif
 -}
 -
 -static void cfi_cleanup(struct module *mod)
 -{
 -#ifdef CONFIG_CFI_CLANG
 -      cfi_module_remove(mod, mod_tree.addr_min);
 -#endif
 -}
 -
  /* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */
  char *module_flags(struct module *mod, char *buf, bool show_state)
  {
diff --combined lib/Kconfig.debug
index f473f7d8a0a2228c64c0daaf8b821d261958d656,75f2eaf4f1107d0d06509fd9039d0c75c338ed96..a05cd9dc5f8b3df9618a25bb08c1648713301412
@@@ -264,10 -264,8 +264,10 @@@ config DEBUG_INFO_DWARF_TOOLCHAIN_DEFAU
  config DEBUG_INFO_DWARF4
        bool "Generate DWARF Version 4 debuginfo"
        select DEBUG_INFO
 +      depends on !CC_IS_CLANG || (CC_IS_CLANG && (AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 23502)))
        help
 -        Generate DWARF v4 debug info. This requires gcc 4.5+ and gdb 7.0+.
 +        Generate DWARF v4 debug info. This requires gcc 4.5+, binutils 2.35.2
 +        if using clang without clang's integrated assembler, and gdb 7.0+.
  
          If you have consumers of DWARF debug info that are not ready for
          newer revisions of DWARF, you may wish to choose this or have your
@@@ -2511,18 -2509,6 +2511,18 @@@ config MEMCPY_KUNIT_TES
  
          If unsure, say N.
  
 +config IS_SIGNED_TYPE_KUNIT_TEST
 +      tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS
 +      depends on KUNIT
 +      default KUNIT_ALL_TESTS
 +      help
 +        Builds unit tests for the is_signed_type() macro.
 +
 +        For more information on KUnit and unit tests in general please refer
 +        to the KUnit documentation in Documentation/dev-tools/kunit/.
 +
 +        If unsure, say N.
 +
  config OVERFLOW_KUNIT_TEST
        tristate "Test check_*_overflow() functions at runtime" if !KUNIT_ALL_TESTS
        depends on KUNIT
@@@ -2547,15 -2533,6 +2547,15 @@@ config STACKINIT_KUNIT_TES
          CONFIG_GCC_PLUGIN_STRUCTLEAK, CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF,
          or CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL.
  
 +config FORTIFY_KUNIT_TEST
 +      tristate "Test fortified str*() and mem*() function internals at runtime" if !KUNIT_ALL_TESTS
 +      depends on KUNIT && FORTIFY_SOURCE
 +      default KUNIT_ALL_TESTS
 +      help
 +        Builds unit tests for checking internals of FORTIFY_SOURCE as used
 +        by the str*() and mem*() family of functions. For testing runtime
 +        traps of FORTIFY_SOURCE, see LKDTM's "FORTIFY_*" tests.
 +
  config TEST_UDELAY
        tristate "udelay test driver"
        help
@@@ -2572,6 -2549,16 +2572,16 @@@ config TEST_STATIC_KEY
  
          If unsure, say N.
  
+ config TEST_DYNAMIC_DEBUG
+       tristate "Test DYNAMIC_DEBUG"
+       depends on DYNAMIC_DEBUG
+       help
+         This module registers a tracer callback to count enabled
+         pr_debugs in a 'do_debugging' function, then alters their
+         enablements, calls the function, and compares counts.
+         If unsure, say N.
  config TEST_KMOD
        tristate "kmod stress tester"
        depends on m
@@@ -2731,40 -2718,6 +2741,40 @@@ config HYPERV_TESTIN
  
  endmenu # "Kernel Testing and Coverage"
  
 +menu "Rust hacking"
 +
 +config RUST_DEBUG_ASSERTIONS
 +      bool "Debug assertions"
 +      depends on RUST
 +      help
 +        Enables rustc's `-Cdebug-assertions` codegen option.
 +
 +        This flag lets you turn `cfg(debug_assertions)` conditional
 +        compilation on or off. This can be used to enable extra debugging
 +        code in development but not in production. For example, it controls
 +        the behavior of the standard library's `debug_assert!` macro.
 +
 +        Note that this will apply to all Rust code, including `core`.
 +
 +        If unsure, say N.
 +
 +config RUST_OVERFLOW_CHECKS
 +      bool "Overflow checks"
 +      default y
 +      depends on RUST
 +      help
 +        Enables rustc's `-Coverflow-checks` codegen option.
 +
 +        This flag allows you to control the behavior of runtime integer
 +        overflow. When overflow-checks are enabled, a Rust panic will occur
 +        on overflow.
 +
 +        Note that this will apply to all Rust code, including `core`.
 +
 +        If unsure, say Y.
 +
 +endmenu # "Rust"
 +
  source "Documentation/Kconfig"
  
  endmenu # Kernel hacking
diff --combined lib/Makefile
index 7d7c9f67eff633471b35983622039fad436e23cd,cd1e4272c6f9f4bb1c1bb2b547b38a38f7f799ec..8f6fc027f605ecd85bb008def18e87a8f89a346d
@@@ -83,6 -83,7 +83,7 @@@ obj-$(CONFIG_TEST_SORT) += test_sort.
  obj-$(CONFIG_TEST_USER_COPY) += test_user_copy.o
  obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o
  obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o
+ obj-$(CONFIG_TEST_DYNAMIC_DEBUG) += test_dynamic_debug.o
  obj-$(CONFIG_TEST_PRINTF) += test_printf.o
  obj-$(CONFIG_TEST_SCANF) += test_scanf.o
  obj-$(CONFIG_TEST_BITMAP) += test_bitmap.o
@@@ -377,11 -378,9 +378,11 @@@ obj-$(CONFIG_BITS_TEST) += test_bits.
  obj-$(CONFIG_CMDLINE_KUNIT_TEST) += cmdline_kunit.o
  obj-$(CONFIG_SLUB_KUNIT_TEST) += slub_kunit.o
  obj-$(CONFIG_MEMCPY_KUNIT_TEST) += memcpy_kunit.o
 +obj-$(CONFIG_IS_SIGNED_TYPE_KUNIT_TEST) += is_signed_type_kunit.o
  obj-$(CONFIG_OVERFLOW_KUNIT_TEST) += overflow_kunit.o
  CFLAGS_stackinit_kunit.o += $(call cc-disable-warning, switch-unreachable)
  obj-$(CONFIG_STACKINIT_KUNIT_TEST) += stackinit_kunit.o
 +obj-$(CONFIG_FORTIFY_KUNIT_TEST) += fortify_kunit.o
  
  obj-$(CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED) += devmem_is_allowed.o
  
index b9536641161c396ceb7e85ba519b2444a7b46963,27898d49e68e3a29389e989b58b97f662454e5b0..8009e0e932162d77d58343332ba0ac671411df15
@@@ -35,7 -35,6 +35,6 @@@
  #include <net/bluetooth/hci_core.h>
  #include <net/bluetooth/rfcomm.h>
  
- #define RFCOMM_TTY_MAGIC 0x6d02               /* magic number for rfcomm struct */
  #define RFCOMM_TTY_PORTS RFCOMM_MAX_DEV       /* whole lotta rfcomm devices */
  #define RFCOMM_TTY_MAJOR 216          /* device node major id of the usb/bluetooth.c driver */
  #define RFCOMM_TTY_MINOR 0
@@@ -855,8 -854,7 +854,8 @@@ static int rfcomm_tty_ioctl(struct tty_
        return -ENOIOCTLCMD;
  }
  
 -static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
 +static void rfcomm_tty_set_termios(struct tty_struct *tty,
 +                                 const struct ktermios *old)
  {
        struct ktermios *new = &tty->termios;
        int old_baud_rate = tty_termios_baud_rate(old);
This page took 0.244654 seconds and 4 git commands to generate.