]> Git Repo - linux.git/commitdiff
Merge tag 'staging-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <[email protected]>
Sun, 7 Jun 2020 17:45:08 +0000 (10:45 -0700)
committerLinus Torvalds <[email protected]>
Sun, 7 Jun 2020 17:45:08 +0000 (10:45 -0700)
Pull staging/IIO driver updates from Greg KH:
 "Here is the large set of staging and IIO driver changes for 5.8-rc1

  Nothing major, but a lot of new IIO drivers are included in here,
  along with other core iio cleanups and changes.

  On the staging driver front, again, nothing noticable. No new
  deletions or additions, just a ton of tiny cleanups all over the tree
  done by a lot of different people. Most coding style, but many actual
  real fixes and cleanups that are nice to see.

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

* tag 'staging-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (618 commits)
  staging: rtl8723bs: Use common packet header constants
  staging: sm750fb: Add names to proc_setBLANK args
  staging: most: usb: init return value in default path of switch/case expression
  staging: vchiq: Get rid of VCHIQ_SERVICE_OPENEND callback reason
  staging: vchiq: move vchiq_release_message() into vchiq
  staging: vchi: Get rid of C++ guards
  staging: vchi: Get rid of not implemented function declarations
  staging: vchi: Get rid of vchiq_status_to_vchi()
  staging: vchi: Get rid of vchi_service_set_option()
  staging: vchi: Merge vchi_msg_queue() into vchi_queue_kernel_message()
  staging: vchiq: Move copy callback handling into vchiq
  staging: vchi: Get rid of vchi_queue_user_message()
  staging: vchi: Get rid of vchi_service_destroy()
  staging: most: usb: use function sysfs_streq
  staging: most: usb: add missing put_device calls
  staging: most: usb: use correct error codes
  staging: most: usb: replace code to calculate array index
  staging: most: usb: don't use error path to exit function on success
  staging: most: usb: move allocation of URB out of critical section
  staging: most: usb: return 0 instead of variable
  ...

1  2 
Documentation/driver-api/driver-model/devres.rst
MAINTAINERS
drivers/iio/adc/Kconfig
drivers/iio/adc/Makefile
drivers/iio/dac/ad5761.c
drivers/staging/comedi/comedi_internal.h
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

index fc242ed4bde5e2beefc3470f9033175bd06d5c31,91b0b8e5556c25487bf42a94ccf9b96f597f6286..644078332354aef42429dc444695f058162fba1e
@@@ -284,21 -284,13 +284,13 @@@ I2
  
  IIO
    devm_iio_device_alloc()
-   devm_iio_device_free()
    devm_iio_device_register()
-   devm_iio_device_unregister()
    devm_iio_kfifo_allocate()
-   devm_iio_kfifo_free()
    devm_iio_triggered_buffer_setup()
-   devm_iio_triggered_buffer_cleanup()
    devm_iio_trigger_alloc()
-   devm_iio_trigger_free()
    devm_iio_trigger_register()
-   devm_iio_trigger_unregister()
    devm_iio_channel_get()
-   devm_iio_channel_release()
    devm_iio_channel_get_all()
-   devm_iio_channel_release_all()
  
  INPUT
    devm_input_allocate_device()
@@@ -372,11 -364,6 +364,11 @@@ MU
    devm_mux_chip_register()
    devm_mux_control_get()
  
 +NET
 +  devm_alloc_etherdev()
 +  devm_alloc_etherdev_mqs()
 +  devm_register_netdev()
 +
  PER-CPU MEM
    devm_alloc_percpu()
    devm_free_percpu()
diff --combined MAINTAINERS
index 71b61aca417bb73290d7932f8a6db7b88e55321f,e10f86b1fea9802b26381fd15ce635154be5beba..464f4525a968c6533a30114ceecf5e1f55aea1b5
@@@ -147,7 -147,7 +147,7 @@@ Maintainers Lis
  M:    Steffen Klassert <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
 -F:    Documentation/networking/device_drivers/3com/vortex.txt
 +F:    Documentation/networking/device_drivers/3com/vortex.rst
  F:    drivers/net/ethernet/3com/3c59x.c
  
  3CR990 NETWORK DRIVER
@@@ -193,7 -193,7 +193,7 @@@ W: https://wireless.wiki.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  F:    Documentation/driver-api/80211/cfg80211.rst
 -F:    Documentation/networking/regulatory.txt
 +F:    Documentation/networking/regulatory.rst
  F:    include/linux/ieee80211.h
  F:    include/net/cfg80211.h
  F:    include/net/ieee80211_radiotap.h
@@@ -294,6 -294,7 +294,7 @@@ F: drivers/gpio/gpio-104-idio-16.
  
  ACCES 104-QUAD-8 DRIVER
  M:    William Breathitt Gray <[email protected]>
+ M:    Syed Nayyar Waris <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
@@@ -815,7 -816,7 +816,7 @@@ R: Saeed Bishara <[email protected]
  R:    Zorik Machulsky <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/device_drivers/amazon/ena.txt
 +F:    Documentation/networking/device_drivers/amazon/ena.rst
  F:    drivers/net/ethernet/amazon/
  
  AMAZON RDMA EFA DRIVER
@@@ -842,13 -843,6 +843,13 @@@ S:       Supporte
  T:    git git://people.freedesktop.org/~agd5f/linux
  F:    drivers/gpu/drm/amd/display/
  
 +AMD ENERGY DRIVER
 +M:    Naveen Krishna Chatradhi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/amd_energy.rst
 +F:    drivers/hwmon/amd_energy.c
 +
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
  M:    Huang Rui <[email protected]>
  L:    [email protected]
@@@ -899,11 -893,6 +900,11 @@@ F:       drivers/gpu/drm/amd/include/v9_struc
  F:    drivers/gpu/drm/amd/include/vi_structs.h
  F:    include/uapi/linux/kfd_ioctl.h
  
 +AMD SPI DRIVER
 +M:    Sanjay R Mehta <[email protected]>
 +S:    Maintained
 +F:    drivers/spi/spi-amd.c
 +
  AMD MP2 I2C DRIVER
  M:    Elie Morisse <[email protected]>
  M:    Nehal Shah <[email protected]>
@@@ -1042,6 -1031,14 +1043,14 @@@ W:    http://ez.analog.com/community/linux
  F:    Documentation/devicetree/bindings/iio/imu/adi,adis16460.yaml
  F:    drivers/iio/imu/adis16460.c
  
+ ANALOG DEVICES INC ADIS16475 DRIVER
+ M:    Nuno Sa <[email protected]>
+ L:    [email protected]
+ W:    http://ez.analog.com/community/linux-device-drivers
+ S:    Supported
+ F:    drivers/iio/imu/adis16475.c
+ F:    Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
  ANALOG DEVICES INC ADM1177 DRIVER
  M:    Beniamin Bia <[email protected]>
  M:    Michael Hennerich <[email protected]>
@@@ -1286,7 -1283,7 +1295,7 @@@ L:      [email protected]
  S:    Supported
  W:    https://www.marvell.com/
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
 -F:    Documentation/networking/device_drivers/aquantia/atlantic.txt
 +F:    Documentation/networking/device_drivers/aquantia/atlantic.rst
  F:    drivers/net/ethernet/aquantia/atlantic/
  
  AQUANTIA ETHERNET DRIVER PTP SUBSYSTEM
@@@ -1350,11 -1347,10 +1359,11 @@@ F:   arch/arm/mach-integrator
  F:    arch/arm/mach-realview/
  F:    arch/arm/mach-versatile/
  F:    arch/arm/plat-versatile/
 +F:    drivers/bus/arm-integrator-lm.c
  F:    drivers/clk/versatile/
  F:    drivers/i2c/busses/i2c-versatile.c
  F:    drivers/irqchip/irq-versatile-fpga.c
 -F:    drivers/mtd/maps/physmap_of_versatile.c
 +F:    drivers/mtd/maps/physmap-versatile.*
  F:    drivers/power/reset/arm-versatile-reboot.c
  F:    drivers/soc/versatile/
  
@@@ -1469,13 -1465,6 +1478,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
  F:    drivers/irqchip/irq-vic.c
  
 +ARM SMC WATCHDOG DRIVER
 +M:    Julius Werner <[email protected]>
 +R:    Evan Benn <[email protected]>
 +S:    Maintained
 +F:    devicetree/bindings/watchdog/arm-smc-wdt.yaml
 +F:    drivers/watchdog/arm_smc_wdt.c
 +
  ARM SMMU DRIVERS
  M:    Will Deacon <[email protected]>
  R:    Robin Murphy <[email protected]>
@@@ -1704,6 -1693,11 +1713,6 @@@ S:     Maintaine
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev
  F:    drivers/clk/clkdev.c
  
 -ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
 -M:    Mike Rapoport <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
  M:    Baruch Siach <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2012,7 -2006,6 +2021,7 @@@ F:      arch/arm/mach-dove
  F:    arch/arm/mach-mv78xx0/
  F:    arch/arm/mach-orion5x/
  F:    arch/arm/plat-orion/
 +F:    drivers/soc/dove/
  
  ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SOC support
  M:    Jason Cooper <[email protected]>
@@@ -2241,7 -2234,6 +2250,7 @@@ F:      drivers/*/qcom
  F:    drivers/*/qcom/
  F:    drivers/bluetooth/btqcomsmd.c
  F:    drivers/clocksource/timer-qcom.c
 +F:    drivers/cpuidle/cpuidle-qcom-spm.c
  F:    drivers/extcon/extcon-qcom*
  F:    drivers/i2c/busses/i2c-qcom-geni.c
  F:    drivers/i2c/busses/i2c-qup.c
@@@ -2289,8 -2281,6 +2298,8 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/realtek.yaml
 +F:    arch/arm/boot/dts/rtd*
 +F:    arch/arm/mach-realtek/
  F:    arch/arm64/boot/dts/realtek/
  
  ARM/RENESAS ARM64 ARCHITECTURE
@@@ -2713,8 -2703,8 +2722,8 @@@ L:      [email protected]
  S:    Supported
  W:    http://wiki.xilinx.com
  T:    git https://github.com/Xilinx/linux-xlnx.git
 -F:    Documentation/devicetree/bindings/i2c/i2c-cadence.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-xiic.txt
 +F:    Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
 +F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/block/xsysace.c
  F:    drivers/clocksource/timer-cadence-ttc.c
@@@ -3210,7 -3200,7 +3219,7 @@@ Q:      https://patchwork.ozlabs.org/project
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
  F:    Documentation/bpf/
 -F:    Documentation/networking/filter.txt
 +F:    Documentation/networking/filter.rst
  F:    arch/*/net/*
  F:    include/linux/bpf*
  F:    include/linux/filter.h
@@@ -3339,7 -3329,7 +3348,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://github.com/anholt/linux
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git
  F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
  F:    drivers/pci/controller/pcie-brcmstb.c
  F:    drivers/staging/vc04_services
@@@ -3500,14 -3490,6 +3509,14 @@@ S:    Supporte
  F:    Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
  F:    drivers/i2c/busses/i2c-brcmstb.c
  
 +BROADCOM BRCMSTB USB EHCI DRIVER
 +M:    Al Cooper <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
 +F:    drivers/usb/host/ehci-brcm.*
 +
  BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
  M:    Al Cooper <[email protected]>
  L:    [email protected]
@@@ -3696,7 -3678,7 +3705,7 @@@ L:      [email protected]
  S:    Odd fixes
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/v4l-drivers/bttv*
 +F:    Documentation/driver-api/media/drivers/bttv*
  F:    drivers/media/pci/bt8xx/bttv*
  
  BUS FREQUENCY DRIVER FOR SAMSUNG EXYNOS
@@@ -3757,7 -3739,7 +3766,7 @@@ CACHEFILES: FS-CACHE BACKEND FOR CACHIN
  M:    David Howells <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    Documentation/filesystems/caching/cachefiles.txt
 +F:    Documentation/filesystems/caching/cachefiles.rst
  F:    fs/cachefiles/
  
  CADENCE MIPI-CSI2 BRIDGES
@@@ -3787,7 -3769,7 +3796,7 @@@ M:      Jonathan Corbet <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/v4l-drivers/cafe_ccic*
 +F:    Documentation/admin-guide/media/cafe_ccic*
  F:    drivers/media/platform/marvell-ccic/
  
  CAIF NETWORK LAYER
@@@ -3923,15 -3905,6 +3932,15 @@@ S:    Supporte
  W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
  F:    drivers/crypto/ccree/
  
 +CCTRNG ARM TRUSTZONE CRYPTOCELL TRUE RANDOM NUMBER GENERATOR (TRNG) DRIVER
 +M:    Hadar Gat <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/char/hw_random/cctrng.c
 +F:    drivers/char/hw_random/cctrng.h
 +F:    Documentation/devicetree/bindings/rng/arm-cctrng.txt
 +W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
 +
  CEC FRAMEWORK
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -3940,8 -3913,8 +3949,8 @@@ W:      http://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/ABI/testing/debugfs-cec-error-inj
  F:    Documentation/devicetree/bindings/media/cec.txt
 -F:    Documentation/media/kapi/cec-core.rst
 -F:    Documentation/media/uapi/cec
 +F:    Documentation/driver-api/media/cec-core.rst
 +F:    Documentation/userspace-api/media/cec
  F:    drivers/media/cec/
  F:    drivers/media/rc/keymaps/rc-cec.c
  F:    include/media/cec-notifier.h
@@@ -4096,11 -4069,12 +4105,11 @@@ M:   Charles Keepax <[email protected]
  M:    Richard Fitzgerald <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
 +F:    Documentation/devicetree/bindings/clock/cirrus,lochnagar.yaml
 +F:    Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.yaml
 +F:    Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.yaml
 +F:    Documentation/devicetree/bindings/sound/cirrus,lochnagar.yaml
  F:    Documentation/hwmon/lochnagar.rst
  F:    drivers/clk/clk-lochnagar.c
  F:    drivers/hwmon/lochnagar-hwmon.c
@@@ -4120,9 -4094,9 +4129,9 @@@ L:      [email protected]
  S:    Supported
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  T:    git https://github.com/CirrusLogic/linux-drivers.git
 -F:    Documentation/devicetree/bindings/mfd/madera.txt
 -F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
 -F:    Documentation/devicetree/bindings/sound/madera.txt
 +F:    Documentation/devicetree/bindings/mfd/cirrus,madera.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml
 +F:    Documentation/devicetree/bindings/sound/cirrus,madera.yaml
  F:    drivers/gpio/gpio-madera*
  F:    drivers/irqchip/irq-madera*
  F:    drivers/mfd/cs47l*
@@@ -4233,7 -4207,7 +4242,7 @@@ M:      [email protected]
  L:    [email protected]
  S:    Maintained
  W:    http://www.coda.cs.cmu.edu/
 -F:    Documentation/filesystems/coda.txt
 +F:    Documentation/filesystems/coda.rst
  F:    fs/coda/
  F:    include/linux/coda*.h
  F:    include/uapi/linux/coda*.h
@@@ -4572,7 -4546,7 +4581,7 @@@ L:      [email protected]
  S:    Odd fixes
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/v4l-drivers/cx88*
 +F:    Documentation/driver-api/media/drivers/cx88*
  F:    drivers/media/pci/cx88/
  
  CXD2820R MEDIA DRIVER
@@@ -4724,7 -4698,7 +4733,7 @@@ F:      net/ax25/sysctl_net_ax25.
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  L:    [email protected]
  S:    Orphan
 -F:    Documentation/networking/device_drivers/dec/dmfe.txt
 +F:    Documentation/networking/device_drivers/dec/dmfe.rst
  F:    drivers/net/ethernet/dec/tulip/dmfe.c
  
  DC390/AM53C974 SCSI driver
@@@ -4758,7 -4732,7 +4767,7 @@@ DECnet NETWORK LAYE
  L:    [email protected]
  S:    Orphan
  W:    http://linux-decnet.sourceforge.net
 -F:    Documentation/networking/decnet.txt
 +F:    Documentation/networking/decnet.rst
  F:    net/decnet/
  
  DECSTATION PLATFORM SUPPORT
@@@ -5026,7 -5000,7 +5035,7 @@@ M:      Jan Kara <[email protected]
  R:    Amir Goldstein <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/filesystems/dnotify.txt
 +F:    Documentation/filesystems/dnotify.rst
  F:    fs/notify/dnotify/
  F:    include/linux/dnotify.h
  
@@@ -5040,7 -5014,7 +5049,7 @@@ W:      http://www.win.tue.nl/~aeb/partition
  DISKQUOTA
  M:    Jan Kara <[email protected]>
  S:    Maintained
 -F:    Documentation/filesystems/quota.txt
 +F:    Documentation/filesystems/quota.rst
  F:    fs/quota/
  F:    include/linux/quota*.h
  F:    include/uapi/linux/quota*.h
@@@ -5075,7 -5049,7 +5084,7 @@@ F:      drivers/dma-buf
  F:    include/linux/*fence.h
  F:    include/linux/dma-buf*
  F:    include/linux/dma-resv.h
 -K:    dma_(buf|fence|resv)
 +K:    \bdma_(?:buf|fence|resv)\b
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
@@@ -5155,14 -5129,12 +5164,14 @@@ F:   scripts/documentation-file-ref-chec
  F:    scripts/kernel-doc
  F:    scripts/sphinx-pre-install
  X:    Documentation/ABI/
 +X:    Documentation/admin-guide/media/
  X:    Documentation/devicetree/
 +X:    Documentation/driver-api/media/
  X:    Documentation/firmware-guide/acpi/
  X:    Documentation/i2c/
 -X:    Documentation/media/
  X:    Documentation/power/
  X:    Documentation/spi/
 +X:    Documentation/userspace-api/media/
  
  DOCUMENTATION SCRIPTS
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -5289,7 -5261,7 +5298,7 @@@ DRM DRIVER FOR ARM VERSATILE TFT PANEL
  M:    Linus Walleij <[email protected]>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
 +F:    Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml
  F:    drivers/gpu/drm/panel/panel-arm-versatile.c
  
  DRM DRIVER FOR ASPEED BMC GFX
@@@ -5315,7 -5287,7 +5324,7 @@@ F:      drivers/gpu/drm/bochs
  DRM DRIVER FOR BOE HIMAX8279D PANELS
  M:    Jerry Han <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt
 +F:    Documentation/devicetree/bindings/display/panel/boe,himax8279d.yaml
  F:    drivers/gpu/drm/panel/panel-boe-himax8279d.c
  
  DRM DRIVER FOR FARADAY TVE200 TV ENCODER
@@@ -5333,7 -5305,7 +5342,7 @@@ F:      drivers/gpu/drm/panel/panel-feixin-k
  DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
  M:    Jagan Teki <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
 +F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
  F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
  DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
@@@ -5368,14 -5340,6 +5377,14 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/i810/
  F:    include/uapi/drm/i810_drm.h
  
 +DRM DRIVER FOR LVDS PANELS
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-lvds.c
 +F:    Documentation/devicetree/bindings/display/panel/lvds.yaml
 +
  DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/mga/
@@@ -5424,7 -5388,7 +5433,7 @@@ F:      include/uapi/drm/nouveau_drm.
  DRM DRIVER FOR OLIMEX LCD-OLINUXINO PANELS
  M:    Stefan Mavrodiev <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt
 +F:    Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml
  F:    drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
  
  DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
@@@ -5441,7 -5405,7 +5450,7 @@@ L:      [email protected]
  S:    Obsolete
  W:    https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    drivers/gpu/drm/cirrus/
 +F:    drivers/gpu/drm/tiny/cirrus.c
  
  DRM DRIVER FOR QXL VIRTUAL GPU
  M:    Dave Airlie <[email protected]>
@@@ -5491,7 -5455,7 +5500,7 @@@ F:      drivers/gpu/drm/tiny/st7586.
  DRM DRIVER FOR SITRONIX ST7701 PANELS
  M:    Jagan Teki <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
 +F:    Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
  F:    drivers/gpu/drm/panel/panel-sitronix-st7701.c
  
  DRM DRIVER FOR SITRONIX ST7735R PANELS
@@@ -6217,6 -6181,7 +6226,6 @@@ M:      Yash Shah <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/edac/sifive_edac.c
 -F:    drivers/soc/sifive_l2_cache.c
  
  EDAC-SKYLAKE
  M:    Tony Luck <[email protected]>
@@@ -6276,7 -6241,7 +6285,7 @@@ L:      [email protected]
  S:    Maintained
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/v4l-drivers/em28xx*
 +F:    Documentation/admin-guide/media/em28xx*
  F:    drivers/media/usb/em28xx/
  
  EMBEDDED LINUX
@@@ -6757,13 -6722,6 +6766,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
  F:    drivers/crypto/caam/
  
 +FREESCALE COLDFIRE M5441X MMC DRIVER
 +M:    Angelo Dureghello <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/sdhci-esdhc-mcf.c
 +F:    include/linux/platform_data/mmc-esdhc-mcf.h
 +
  FREESCALE DIU FRAMEBUFFER DRIVER
  M:    Timur Tabi <[email protected]>
  L:    [email protected]
@@@ -7071,29 -7029,19 +7080,30 @@@ R:   Darren Hart <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
 -F:    Documentation/*futex*
 +F:    Documentation/locking/*futex*
  F:    include/asm-generic/futex.h
  F:    include/linux/futex.h
  F:    include/uapi/linux/futex.h
  F:    kernel/futex.c
  F:    tools/perf/bench/futex*
 -F:    tools/testing/selftests/futex/
 +F:    Documentation/locking/*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
 +F:    include/linux/mfd/gsc.h
 +F:    Documentation/hwmon/gsc-hwmon.rst
 +F:    drivers/hwmon/gsc-hwmon.c
 +F:    include/linux/platform_data/gsc_hwmon.h
  
  GASKET DRIVER FRAMEWORK
  M:    Rob Springer <[email protected]>
  M:    Todd Poynor <[email protected]>
  M:    Ben Chan <[email protected]>
+ M:    Richard Yeh <[email protected]>
  S:    Maintained
  F:    drivers/staging/gasket/
  
@@@ -7291,13 -7239,6 +7301,13 @@@ F:    Documentation/firmware-guide/acpi/gp
  F:    drivers/gpio/gpiolib-acpi.c
  F:    drivers/gpio/gpiolib-acpi.h
  
 +GPIO AGGREGATOR
 +M:    Geert Uytterhoeven <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/admin-guide/gpio/gpio-aggregator.rst
 +F:    drivers/gpio/gpio-aggregator.c
 +
  GPIO IR Transmitter
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -7311,12 -7252,6 +7321,12 @@@ S:    Maintaine
  F:    drivers/gpio/gpio-mockup.c
  F:    tools/testing/selftests/gpio/
  
 +GPIO REGMAP
 +R:    Michael Walle <[email protected]>
 +S:    Maintained
 +F:    drivers/gpio/gpio-regmap.c
 +F:    include/linux/gpio/regmap.h
 +
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  M:    Bartosz Golaszewski <[email protected]>
@@@ -7530,7 -7465,7 +7540,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
 -F:    Documentation/devicetree/bindings/media/rockchip-vpu.txt
 +F:    Documentation/devicetree/bindings/media/rockchip-vpu.yaml
  F:    drivers/staging/media/hantro/
  
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
@@@ -7571,7 -7506,7 +7581,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git hwspinlock-next
  F:    Documentation/devicetree/bindings/hwlock/
 -F:    Documentation/hwspinlock.txt
 +F:    Documentation/locking/hwspinlock.rst
  F:    drivers/hwspinlock/
  F:    include/linux/hwspinlock.h
  
@@@ -7804,9 -7739,7 +7814,9 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/vm/hmm.rst
  F:    include/linux/hmm*
 +F:    lib/test_hmm*
  F:    mm/hmm*
 +F:    tools/testing/selftests/vm/*hmm*
  
  HOST AP DRIVER
  M:    Jouni Malinen <[email protected]>
@@@ -7880,10 -7813,10 +7890,10 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/humidity/hts221*
  
  HUAWEI ETHERNET DRIVER
 -M:    Aviad Krawczyk <aviad.krawczyk@huawei.com>
 +M:    Bin Luo <luobin9@huawei.com>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/hinic.txt
 +F:    Documentation/networking/hinic.rst
  F:    drivers/net/ethernet/huawei/hinic/
  
  HUGETLB FILESYSTEM
@@@ -7935,7 -7868,7 +7945,7 @@@ S:      Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  F:    Documentation/ABI/testing/debugfs-hyperv
 -F:    Documentation/networking/device_drivers/microsoft/netvsc.txt
 +F:    Documentation/networking/device_drivers/microsoft/netvsc.rst
  F:    arch/x86/hyperv
  F:    arch/x86/include/asm/hyperv-tlfs.h
  F:    arch/x86/include/asm/mshyperv.h
@@@ -7952,7 -7885,6 +7962,7 @@@ F:      drivers/pci/controller/pci-hyperv.
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
 +F:    include/asm-generic/hyperv-tlfs.h
  F:    include/asm-generic/mshyperv.h
  F:    include/clocksource/hyperv_timer.h
  F:    include/linux/hyperv.h
  S:    Maintained
  F:    drivers/platform/x86/intel_atomisp2_pm.c
  
 +INTEL BROXTON PMC DRIVER
 +M:    Mika Westerberg <[email protected]>
 +M:    Zha Qipeng <[email protected]>
 +S:    Maintained
 +F:    drivers/mfd/intel_pmc_bxt.c
 +F:    include/linux/mfd/intel_pmc_bxt.h
 +
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <[email protected]>
  M:    Artur Paszkiewicz <[email protected]>
@@@ -8722,18 -8647,16 +8732,18 @@@ M:   Bingbu Cao <[email protected]
  R:    Tian Shu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
 +F:    Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
  F:    drivers/media/pci/intel/ipu3/
  
  INTEL IPU3 CSI-2 IMGU DRIVER
  M:    Sakari Ailus <[email protected]>
 +R:    Bingbu Cao <[email protected]>
 +R:    Tian Shu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
 -F:    Documentation/media/v4l-drivers/ipu3.rst
 -F:    Documentation/media/v4l-drivers/ipu3_rcb.svg
 +F:    Documentation/admin-guide/media/ipu3.rst
 +F:    Documentation/admin-guide/media/ipu3_rcb.svg
 +F:    Documentation/userspace-api/media/v4l/pixfmt-meta-intel-ipu3.rst
  F:    drivers/staging/media/ipu3/
  
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
@@@ -8785,13 -8708,6 +8795,13 @@@ F:    include/uapi/linux/mic_common.
  F:    include/uapi/linux/mic_ioctl.h
  F:    include/uapi/linux/scif_ioctl.h
  
 +INTEL P-Unit IPC DRIVER
 +M:    Zha Qipeng <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/x86/include/asm/intel_punit_ipc.h
 +F:    drivers/platform/x86/intel_punit_ipc.c
 +
  INTEL PMC CORE DRIVER
  M:    Rajneesh Bhardwaj <[email protected]>
  M:    Vishwanath Somayaji <[email protected]>
  S:    Maintained
  F:    drivers/platform/x86/intel_pmc_core*
  
 -INTEL PMC/P-Unit IPC DRIVER
 -M:    Zha Qipeng<[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    arch/x86/include/asm/intel_pmc_ipc.h
 -F:    arch/x86/include/asm/intel_punit_ipc.h
 -F:    drivers/platform/x86/intel_pmc_ipc.c
 -F:    drivers/platform/x86/intel_punit_ipc.c
 -
  INTEL PMIC GPIO DRIVERS
  M:    Andy Shevchenko <[email protected]>
  S:    Maintained
@@@ -8818,8 -8743,8 +8828,8 @@@ INTEL PRO/WIRELESS 2100, 2200BG, 2915AB
  M:    Stanislav Yakovlev <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/networking/device_drivers/intel/ipw2100.txt
 -F:    Documentation/networking/device_drivers/intel/ipw2200.txt
 +F:    Documentation/networking/device_drivers/intel/ipw2100.rst
 +F:    Documentation/networking/device_drivers/intel/ipw2200.rst
  F:    drivers/net/wireless/intel/ipw2x00/
  
  INTEL PSTATE DRIVER
@@@ -8837,12 -8762,6 +8847,12 @@@ S:    Supporte
  F:    drivers/infiniband/hw/i40iw/
  F:    include/uapi/rdma/i40iw-abi.h
  
 +INTEL SCU DRIVERS
 +M:    Mika Westerberg <[email protected]>
 +S:    Maintained
 +F:    arch/x86/include/asm/intel_scu_ipc.h
 +F:    drivers/platform/x86/intel_scu_*
 +
  INTEL SPEED SELECT TECHNOLOGY
  M:    Srinivas Pandruvada <[email protected]>
  L:    [email protected]
@@@ -8909,13 -8828,6 +8919,13 @@@ F:    Documentation/admin-guide/wimax/i240
  F:    drivers/net/wimax/i2400m/
  F:    include/uapi/linux/wimax/i2400m.h
  
 +INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER
 +M:    Jithu Joseph <[email protected]>
 +R:    Maurice Ma <[email protected]>
 +S:    Maintained
 +W:    https://slimbootloader.github.io/security/firmware-update.html
 +F:    drivers/platform/x86/intel-wmi-sbl-fw-update.c
 +
  INTEL WMI THUNDERBOLT FORCE POWER DRIVER
  M:    Mario Limonciello <[email protected]>
  S:    Maintained
@@@ -9001,7 -8913,7 +9011,7 @@@ M:      Corey Minyard <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://openipmi.sourceforge.net/
 -F:    Documentation/IPMI.txt
 +F:    Documentation/driver-api/ipmi.rst
  F:    Documentation/devicetree/bindings/ipmi/
  F:    drivers/char/ipmi/
  F:    include/linux/ipmi*
@@@ -9023,7 -8935,7 +9033,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git
 -F:    Documentation/networking/ipvs-sysctl.txt
 +F:    Documentation/networking/ipvs-sysctl.rst
  F:    include/net/ip_vs.h
  F:    include/uapi/linux/ip_vs.h
  F:    net/netfilter/ipvs/
@@@ -9043,7 -8955,7 +9053,7 @@@ IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY
  M:    Marc Zyngier <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 -F:    Documentation/IRQ-domain.txt
 +F:    Documentation/core-api/irq/irq-domain.rst
  F:    include/linux/irqdomain.h
  F:    kernel/irq/irqdomain.c
  F:    kernel/irq/msi.c
@@@ -9168,7 -9080,7 +9178,7 @@@ L:      [email protected]
  S:    Maintained
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/v4l-drivers/ivtv*
 +F:    Documentation/admin-guide/media/ivtv*
  F:    drivers/media/pci/ivtv/
  F:    include/uapi/linux/ivtv*
  
@@@ -9398,6 -9310,7 +9408,6 @@@ F:      arch/arm64/include/asm/kvm
  F:    arch/arm64/include/uapi/asm/kvm*
  F:    arch/arm64/kvm/
  F:    include/kvm/arm_*
 -F:    virt/kvm/arm/
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  L:    [email protected]
@@@ -9608,7 -9521,7 +9618,7 @@@ F:      drivers/soc/lanti
  LAPB module
  L:    [email protected]
  S:    Orphan
 -F:    Documentation/networking/lapb-module.txt
 +F:    Documentation/networking/lapb-module.rst
  F:    include/*/lapb.h
  F:    net/lapb/
  
@@@ -9822,13 -9735,6 +9832,13 @@@ F:    drivers/lightnvm
  F:    include/linux/lightnvm.h
  F:    include/uapi/linux/lightnvm.h
  
 +LINEAR RANGES HELPERS
 +M:    Mark Brown <[email protected]>
 +R:    Matti Vaittinen <[email protected]>
 +F:    lib/linear_ranges.c
 +F:    lib/test_linear_ranges.c
 +F:    include/linux/linear_range.h
 +
  LINUX FOR POWER MACINTOSH
  M:    Benjamin Herrenschmidt <[email protected]>
  L:    [email protected]
@@@ -9895,7 -9801,7 +9905,7 @@@ F:      arch/powerpc/platforms/83xx
  F:    arch/powerpc/platforms/85xx/
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
 -M:    Christophe Leroy <christophe.leroy@c-s.fr>
 +M:    Christophe Leroy <christophe.leroy@csgroup.eu>
  L:    [email protected]
  S:    Maintained
  F:    arch/powerpc/platforms/8xx/
@@@ -9955,12 -9861,10 +9965,12 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    Documentation/livepatch/
 +F:    arch/powerpc/include/asm/livepatch.h
 +F:    arch/s390/include/asm/livepatch.h
  F:    arch/x86/include/asm/livepatch.h
 -F:    arch/x86/kernel/livepatch.c
  F:    include/linux/livepatch.h
  F:    kernel/livepatch/
 +F:    lib/livepatch/
  F:    samples/livepatch/
  F:    tools/testing/selftests/livepatch/
  
@@@ -10059,7 -9963,7 +10069,7 @@@ F:    drivers/hid/hid-lg-g15.
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <[email protected]>
 -M:    Chaitra P B <chaitra.basappa@broadcom.com>
 +M:    Sreekanth Reddy <sreekanth.reddy@broadcom.com>
  M:    Suganath Prabu Subramani <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -10181,7 -10085,7 +10191,7 @@@ S:   Maintaine
  W:    https://wireless.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 -F:    Documentation/networking/mac80211-injection.txt
 +F:    Documentation/networking/mac80211-injection.rst
  F:    Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
  F:    drivers/net/wireless/mac80211_hwsim.[ch]
  F:    include/net/mac80211.h
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/max2175.txt
 -F:    Documentation/media/v4l-drivers/max2175.rst
 +F:    Documentation/userspace-api/media/drivers/max2175.rst
  F:    drivers/media/i2c/max2175*
  F:    include/uapi/linux/max2175.h
  
@@@ -10562,8 -10466,8 +10572,8 @@@ M:   Philipp Zabel <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/admin-guide/media/imx.rst
  F:    Documentation/devicetree/bindings/media/imx.txt
 -F:    Documentation/media/v4l-drivers/imx.rst
  F:    drivers/staging/media/imx/
  F:    include/linux/imx-media.h
  F:    include/media/imx.h
@@@ -10573,9 -10477,9 +10583,9 @@@ M:   Rui Miguel Silva <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/admin-guide/media/imx7.rst
  F:    Documentation/devicetree/bindings/media/imx7-csi.txt
  F:    Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
 -F:    Documentation/media/v4l-drivers/imx7.rst
  F:    drivers/staging/media/imx/imx7-media-csi.c
  F:    drivers/staging/media/imx/imx7-mipi-csis.c
  
@@@ -10721,10 -10625,8 +10731,10 @@@ S: Maintaine
  W:    https://linuxtv.org
  Q:    http://patchwork.kernel.org/project/linux-media/list/
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/admin-guide/media/
  F:    Documentation/devicetree/bindings/media/
 -F:    Documentation/media/
 +F:    Documentation/driver-api/media/
 +F:    Documentation/userspace-api/media/
  F:    drivers/media/
  F:    drivers/staging/media/
  F:    include/linux/platform_data/media/
@@@ -11124,12 -11026,10 +11134,12 @@@ F:        drivers/mtd/nand/raw/meson_
  
  MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
  M:    Maxime Jourdan <[email protected]>
 +M:    Neil Armstrong <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
  F:    drivers/staging/media/meson/vdec/
  
  METHODE UDPU SUPPORT
@@@ -11502,20 -11402,15 +11512,20 @@@ F:        kernel/module.
  MONOLITHIC POWER SYSTEM PMIC DRIVER
  M:    Saravanan Sekar <[email protected]>
  S:    Maintained
 +F:    Documentation/devicetree/bindings/mfd/mps,mp2629.yaml
  F:    Documentation/devicetree/bindings/regulator/mps,mp*.yaml
 +F:    drivers/iio/adc/mp2629_adc.c
 +F:    drivers/mfd/mp2629.c
 +F:    drivers/power/supply/mp2629_charger.c
  F:    drivers/regulator/mp5416.c
  F:    drivers/regulator/mpq7920.c
  F:    drivers/regulator/mpq7920.h
 +F:    include/linux/mfd/mp2629.h
  
  MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
  S:    Orphan
  W:    http://popies.net/meye/
 -F:    Documentation/media/v4l-drivers/meye*
 +F:    Documentation/userspace-api/media/drivers/meye*
  F:    drivers/media/pci/meye/
  F:    include/uapi/linux/meye.h
  
@@@ -11774,8 -11669,8 +11784,8 @@@ NETERION 10GbE DRIVERS (s2io/vxge
  M:    Jon Mason <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/device_drivers/neterion/s2io.txt
 -F:    Documentation/networking/device_drivers/neterion/vxge.txt
 +F:    Documentation/networking/device_drivers/neterion/s2io.rst
 +F:    Documentation/networking/device_drivers/neterion/vxge.rst
  F:    drivers/net/ethernet/neterion/
  
  NETFILTER
@@@ -12542,15 -12437,6 +12552,15 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/ov2685.c
  
 +OMNIVISION OV2740 SENSOR DRIVER
 +M:    Tianshu Qiu <[email protected]>
 +R:    Shawn Tu <[email protected]>
 +R:    Bingbu Cao <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov2740.c
 +
  OMNIVISION OV5640 SENSOR DRIVER
  M:    Steve Longerbeam <[email protected]>
  L:    [email protected]
@@@ -12613,11 -12499,10 +12623,11 @@@ F:        Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ov7740.c
  
  OMNIVISION OV8856 SENSOR DRIVER
 -M:    Ben Kao <ben.kao@intel.com>
 +M:    Dongchun Zhu <dongchun.zhu@mediatek.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/ov8856.yaml
  F:    drivers/media/i2c/ov8856.c
  
  OMNIVISION OV9640 SENSOR DRIVER
@@@ -12673,8 -12558,8 +12683,8 @@@ M:   Pantelis Antoniou <pantelis.antoniou
  M:    Frank Rowand <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/dynamic-resolution-notes.txt
 -F:    Documentation/devicetree/overlay-notes.txt
 +F:    Documentation/devicetree/dynamic-resolution-notes.rst
 +F:    Documentation/devicetree/overlay-notes.rst
  F:    drivers/of/overlay.c
  F:    drivers/of/resolver.c
  K:    of_overlay_notifier_
@@@ -12892,7 -12777,7 +12902,7 @@@ M:   "James E.J. Bottomley" <James.Bottom
  M:    Helge Deller <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.parisc-linux.org/
 +W:    https://parisc.wiki.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-parisc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
 -F:    drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c
 +F:    drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
  
  PCI DRIVER FOR RENESAS R-CAR
  M:    Marek Vasut <[email protected]>
@@@ -13090,7 -12975,6 +13100,7 @@@ M:   Yoshihiro Shimoda <yoshihiro.shimoda
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/*rcar*
  F:    drivers/pci/controller/*rcar*
  
  PCI DRIVER FOR SAMSUNG EXYNOS
@@@ -13284,8 -13168,8 +13294,8 @@@ PCIE DRIVER FOR SOCIONEXT UNIPHIE
  M:    Kunihiko Hayashi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/uniphier-pcie.txt
 -F:    drivers/pci/controller/dwc/pcie-uniphier.c
 +F:    Documentation/devicetree/bindings/pci/uniphier-pcie*
 +F:    drivers/pci/controller/dwc/pcie-uniphier*
  
  PCIE DRIVER FOR ST SPEAR13XX
  M:    Pratyush Anand <[email protected]>
@@@ -13392,7 -13276,7 +13402,7 @@@ F:   drivers/input/joystick/pxrc.
  PHONET PROTOCOL
  M:    Remi Denis-Courmont <[email protected]>
  S:    Supported
 -F:    Documentation/networking/phonet.txt
 +F:    Documentation/networking/phonet.rst
  F:    include/linux/phonet.h
  F:    include/net/phonet/
  F:    include/uapi/linux/phonet.h
@@@ -13802,7 -13686,6 +13812,7 @@@ M:   Tony Luck <[email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore
  F:    Documentation/admin-guide/ramoops.rst
 +F:    Documentation/admin-guide/pstore-blk.rst
  F:    Documentation/devicetree/bindings/reserved-memory/ramoops.txt
  F:    drivers/acpi/apei/erst.c
  F:    drivers/firmware/efi/efi-pstore.c
@@@ -13840,8 -13723,8 +13850,8 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/cec-drivers/pulse8-cec.rst
 -F:    drivers/media/usb/pulse8-cec/*
 +F:    Documentation/admin-guide/media/pulse8-cec.rst
 +F:    drivers/media/cec/usb/pulse8/
  
  PVRUSB2 VIDEO4LINUX DRIVER
  M:    Mike Isely <[email protected]>
  S:    Maintained
  W:    http://www.isely.net/pvrusb2/
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/v4l-drivers/pvrusb2*
 +F:    Documentation/driver-api/media/drivers/pvrusb2*
  F:    drivers/media/usb/pvrusb2/
  
  PWC WEBCAM DRIVER
@@@ -14097,8 -13980,8 +14107,8 @@@ QUALCOMM CAMERA SUBSYSTEM DRIVE
  M:    Todor Tomov <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/media/qcom_camss.rst
  F:    Documentation/devicetree/bindings/media/qcom,camss.txt
 -F:    Documentation/media/v4l-drivers/qcom_camss.rst
  F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
@@@ -14162,7 -14045,7 +14172,7 @@@ M:   Subash Abhinov Kasiviswanathan <suba
  M:    Sean Tranchetti <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/networking/device_drivers/qualcomm/rmnet.txt
 +F:    Documentation/networking/device_drivers/qualcomm/rmnet.rst
  F:    drivers/net/ethernet/qualcomm/rmnet/
  F:    include/linux/if_rmnet.h
  
@@@ -14193,7 -14076,7 +14203,7 @@@ F:   drivers/net/wireless/ath/wcn36xx
  
  QUANTENNA QTNFMAC WIRELESS DRIVER
  M:    Igor Mitsyanko <[email protected]>
 -M:    Sergey Matyukevich <smatyukevich@quantenna.com>
 +R:    Sergey Matyukevich <geomatsi@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/quantenna
  RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <[email protected]>
  M:    Christian König <[email protected]>
 -M:    David (ChunMing) Zhou <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://people.freedesktop.org/~agd5f/linux
@@@ -14253,7 -14137,7 +14263,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/usb/rainshadow-cec/*
 +F:    drivers/media/cec/usb/rainshadow/
  
  RALINK MIPS ARCHITECTURE
  M:    John Crispin <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    https://oss.oracle.com/projects/rds/
 -F:    Documentation/networking/rds.txt
 +F:    Documentation/networking/rds.rst
  F:    net/rds/
  
  RDT - RESOURCE ALLOCATION
@@@ -14356,7 -14240,7 +14366,7 @@@ M:   Reinette Chatre <reinette.chatre@int
  L:    [email protected]
  S:    Supported
  F:    Documentation/x86/resctrl*
 -F:    arch/x86/include/asm/resctrl_sched.h
 +F:    arch/x86/include/asm/resctrl.h
  F:    arch/x86/kernel/cpu/resctrl/
  F:    tools/testing/selftests/resctrl/
  
@@@ -14588,13 -14472,6 +14598,13 @@@ F: arch/riscv
  N:    riscv
  K:    riscv
  
 +RNBD BLOCK DRIVERS
 +M:    Danil Kipnis <[email protected]>
 +M:    Jack Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/block/rnbd/
 +
  ROCCAT DRIVERS
  M:    Stefan Achatz <[email protected]>
  S:    Maintained
@@@ -14613,19 -14490,10 +14623,19 @@@ ROCKCHIP RASTER 2D GRAPHIC ACCELERATIO
  M:    Jacob Chen <[email protected]>
  M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/media/rockchip-rga.txt
 +F:    Documentation/devicetree/bindings/media/rockchip-rga.yaml
  F:    drivers/media/platform/rockchip/rga/
  
 +ROCKCHIP VIDEO DECODER DRIVER
 +M:    Ezequiel Garcia <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/rockchip,vdec.yaml
 +F:    drivers/staging/media/rkvdec/
 +
  ROCKER DRIVER
  M:    Jiri Pirko <[email protected]>
  L:    [email protected]
@@@ -14732,19 -14600,12 +14742,19 @@@ S:        Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
 +RTRS TRANSPORT DRIVERS
 +M:    Danil Kipnis <[email protected]>
 +M:    Jack Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/infiniband/ulp/rtrs/
 +
  RXRPC SOCKETS (AF_RXRPC)
  M:    David Howells <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://www.infradead.org/~dhowells/kafs/
 -F:    Documentation/networking/rxrpc.txt
 +F:    Documentation/networking/rxrpc.rst
  F:    include/keys/rxrpc-type.h
  F:    include/net/af_rxrpc.h
  F:    include/trace/events/rxrpc.h
@@@ -14786,7 -14647,6 +14796,7 @@@ S:   Supporte
  W:    http://www.ibm.com/developerworks/linux/linux390/
  F:    block/partitions/ibm.c
  F:    drivers/s390/block/dasd*
 +F:    include/linux/dasd_mod.h
  
  S390 IOMMU (PCI)
  M:    Gerald Schaefer <[email protected]>
  S:    Odd fixes
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/v4l-drivers/saa7134*
 +F:    Documentation/driver-api/media/drivers/saa7134*
  F:    drivers/media/pci/saa7134/
  
  SAA7146 VIDEO4LINUX-2 DRIVER
@@@ -15153,7 -15013,7 +15163,7 @@@ M:   Marcelo Ricardo Leitner <marcelo.lei
  L:    [email protected]
  S:    Maintained
  W:    http://lksctp.sourceforge.net
 -F:    Documentation/networking/sctp.txt
 +F:    Documentation/networking/sctp.rst
  F:    include/linux/sctp.h
  F:    include/net/sctp/
  F:    include/uapi/linux/sctp.h
@@@ -15380,6 -15240,11 +15390,6 @@@ T:  git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/rj54n1cb0c.c
  F:    include/media/i2c/rj54n1cb0c.h
  
 -SH_VEU V4L2 MEM2MEM DRIVER
 -L:    [email protected]
 -S:    Orphan
 -F:    drivers/media/platform/sh_veu.c
 -
  SH_VOU V4L2 OUTPUT DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -15624,15 -15489,6 +15634,15 @@@ M: Nicolas Pitre <[email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/smsc/smc91x.*
  
 +SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
 +M:    Mark Rutland <[email protected]>
 +M:    Lorenzo Pieralisi <[email protected]>
 +M:    Sudeep Holla <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/smccc/
 +F:    include/linux/arm-smccc.h
 +
  SMIA AND SMIA++ IMAGE SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -15701,7 -15557,7 +15711,7 @@@ SOCIONEXT (SNI) AVE NETWORK DRIVE
  M:    Kunihiko Hayashi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt
 +F:    Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
  F:    drivers/net/ethernet/socionext/sni_ave.c
  
  SOCIONEXT (SNI) NETSEC NETWORK DRIVER
@@@ -15809,7 -15665,7 +15819,7 @@@ F:   drivers/ssb
  F:    include/linux/ssb/
  
  SONY IMX214 SENSOR DRIVER
 -M:    Ricardo Ribalda <ri[email protected]>
 +M:    Ricardo Ribalda <ri[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -16032,7 -15888,7 +16042,7 @@@ SPIDERNET NETWORK DRIVER for CEL
  M:    Ishizaki Kou <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/device_drivers/toshiba/spider_net.txt
 +F:    Documentation/networking/device_drivers/toshiba/spider_net.rst
  F:    drivers/net/ethernet/toshiba/spider_net*
  
  SPMI SUBSYSTEM
@@@ -16049,7 -15905,7 +16059,7 @@@ M:   Jeremy Kerr <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/power/cell/
 -F:    Documentation/filesystems/spufs.txt
 +F:    Documentation/filesystems/spufs/spufs.rst
  F:    arch/powerpc/platforms/cell/spufs/
  
  SQUASHFS FILE SYSTEM
  S:    Supported
  F:    Documentation/process/stable-kernel-rules.rst
  
 +STAGING - ATOMISP DRIVER
 +M:    Mauro Carvalho Chehab <[email protected]>
 +R:    Sakari Ailus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/media/atomisp/
 +
  STAGING - COMEDI
  M:    Ian Abbott <[email protected]>
  M:    H Hartley Sweeten <[email protected]>
@@@ -16404,10 -16253,9 +16414,10 @@@ F: drivers/tty/serial/8250/8250_lpss.
  
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
  M:    Hoan Tran <[email protected]>
 +M:    Serge Semin <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
  F:    drivers/gpio/gpio-dwapb.c
  
  SYNOPSYS DESIGNWARE AXI DMAC DRIVER
@@@ -16765,16 -16613,6 +16775,16 @@@ M: Laxman Dewangan <[email protected]
  S:    Supported
  F:    drivers/spi/spi-tegra*
  
 +TEGRA VIDEO DRIVER
 +M:    Thierry Reding <[email protected]>
 +M:    Jonathan Hunter <[email protected]>
 +M:    Sowjanya Komatineni <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
 +F:    drivers/staging/media/tegra-video/
 +
  TEGRA XUSB PADCTL DRIVER
  M:    JC Kuo <[email protected]>
  S:    Supported
@@@ -16814,7 -16652,7 +16824,7 @@@ S:   Maintaine
  F:    sound/soc/ti/
  
  TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
 -M:    Ricardo Ribalda <ri[email protected]>
 +M:    Ricardo Ribalda <ri[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
@@@ -17147,7 -16985,7 +17157,7 @@@ M:   Samuel Chessman <[email protected]
  L:    [email protected] (subscribers-only)
  S:    Maintained
  W:    http://sourceforge.net/projects/tlan/
 -F:    Documentation/networking/device_drivers/ti/tlan.txt
 +F:    Documentation/networking/device_drivers/ti/tlan.rst
  F:    drivers/net/ethernet/ti/tlan.*
  
  TM6000 VIDEO4LINUX DRIVER
  S:    Odd fixes
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/v4l-drivers/tm6000*
 +F:    Documentation/admin-guide/media/tm6000*
  F:    drivers/media/usb/tm6000/
  
  TMIO/SDHI MMC DRIVER
@@@ -17337,7 -17175,7 +17347,7 @@@ TUN/TAP drive
  M:    Maxim Krasnyansky <[email protected]>
  S:    Maintained
  W:    http://vtun.sourceforge.net/tun
 -F:    Documentation/networking/tuntap.txt
 +F:    Documentation/networking/tuntap.rst
  F:    arch/um/os-Linux/drivers/
  
  TURBOCHANNEL SUBSYSTEM
@@@ -17767,13 -17605,6 +17777,13 @@@ F: Documentation/driver-api/usb/typec.r
  F:    drivers/usb/typec/
  F:    include/linux/usb/typec.h
  
 +USB TYPEC INTEL PMC MUX DRIVER
 +M:    Heikki Krogerus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/firmware-guide/acpi/intel-pmc-mux.rst
 +F:    drivers/usb/typec/mux/intel_pmc_mux.c
 +
  USB TYPEC PI3USB30532 MUX DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://royale.zerezo.com/zr364xx/
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/media/v4l-drivers/zr364xx*
 +F:    Documentation/admin-guide/media/zr364xx*
  F:    drivers/media/usb/zr364xx/
  
  USER-MODE LINUX (UML)
  S:    Maintained
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/vicodec/*
 +F:    drivers/media/test-drivers/vicodec/*
  
  VIDEO I2C POLLING DRIVER
  M:    Matt Ranostay <[email protected]>
  S:    Maintained
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/vimc/*
 +F:    drivers/media/test-drivers/vimc/*
  
  VIRT LIB
  M:    Alex Williamson <[email protected]>
  S:    Maintained
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/vivid/*
 +F:    drivers/media/test-drivers/vivid/*
  
  VLYNQ BUS
  M:    Florian Fainelli <[email protected]>
@@@ -18289,7 -18120,7 +18299,7 @@@ M:   David Ahern <[email protected]
  M:    Shrijeet Mukherjee <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/networking/vrf.txt
 +F:    Documentation/networking/vrf.rst
  F:    drivers/net/vrf.c
  
  VSPRINTF
@@@ -18453,11 -18284,11 +18463,11 @@@ L:        [email protected]
  S:    Supported
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  T:    git https://github.com/CirrusLogic/linux-drivers.git
 -F:    Documentation/devicetree/bindings/extcon/extcon-arizona.txt
 -F:    Documentation/devicetree/bindings/mfd/arizona.txt
 +F:    Documentation/devicetree/bindings/extcon/wlf,arizona.yaml
 +F:    Documentation/devicetree/bindings/mfd/wlf,arizona.yaml
  F:    Documentation/devicetree/bindings/mfd/wm831x.txt
 -F:    Documentation/devicetree/bindings/regulator/arizona-regulator.txt
 -F:    Documentation/devicetree/bindings/sound/wlf,arizona.txt
 +F:    Documentation/devicetree/bindings/regulator/wlf,arizona.yaml
 +F:    Documentation/devicetree/bindings/sound/wlf,arizona.yaml
  F:    Documentation/hwmon/wm83??.rst
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
  F:    drivers/clk/clk-wm83*.c
@@@ -18634,12 -18465,8 +18644,12 @@@ R: Jonathan Lemon <jonathan.lemon@gmail
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    kernel/bpf/xskmap.c
 +F:    include/net/xdp_sock*
 +F:    include/net/xsk_buff_pool.h
 +F:    include/uapi/linux/if_xdp.h
  F:    net/xdp/
 +F:    samples/bpf/xdpsock*
 +F:    tools/lib/bpf/xsk*
  
  XEN BLOCK SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
@@@ -18729,8 -18556,8 +18739,8 @@@ W:   http://xfs.org
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  F:    Documentation/ABI/testing/sysfs-fs-xfs
  F:    Documentation/admin-guide/xfs.rst
 -F:    Documentation/filesystems/xfs-delayed-logging-design.txt
 -F:    Documentation/filesystems/xfs-self-describing-metadata.txt
 +F:    Documentation/filesystems/xfs-delayed-logging-design.rst
 +F:    Documentation/filesystems/xfs-self-describing-metadata.rst
  F:    fs/xfs/
  F:    include/uapi/linux/dqblk_xfs.h
  F:    include/uapi/linux/fsmap.h
  S:    Maintained
  W:    http://yaina.de/jreuter/
  W:    http://www.qsl.net/dl1bke/
 -F:    Documentation/networking/z8530drv.txt
 +F:    Documentation/networking/z8530drv.rst
  F:    drivers/net/hamradio/*scc.c
  F:    drivers/net/hamradio/z8530.h
  
diff --combined drivers/iio/adc/Kconfig
index a864ede98114f0dac6b862d3a1783483b72b3da9,c48c00077775a27f1425270222b1718bd7088d2c..ff3569635ce0d4f6178ad5eb2926f4047b615c88
@@@ -246,6 -246,41 +246,41 @@@ config AD799
          To compile this driver as a module, choose M here: the module will be
          called ad799x.
  
+ config AD9467
+       tristate "Analog Devices AD9467 High Speed ADC driver"
+       depends on SPI
+       select ADI_AXI_ADC
+       help
+         Say yes here to build support for Analog Devices:
+         * AD9467 16-Bit, 200 MSPS/250 MSPS Analog-to-Digital Converter
+         The driver requires the assistance of the AXI ADC IP core to operate,
+         since SPI is used for configuration only, while data has to be
+         streamed into memory via DMA.
+         To compile this driver as a module, choose M here: the module will be
+         called ad9467.
+ config ADI_AXI_ADC
+       tristate "Analog Devices Generic AXI ADC IP core driver"
+       select IIO_BUFFER
+       select IIO_BUFFER_HW_CONSUMER
+       select IIO_BUFFER_DMAENGINE
+       help
+         Say yes here to build support for Analog Devices Generic
+         AXI ADC IP core. The IP core is used for interfacing with
+         analog-to-digital (ADC) converters that require either a high-speed
+         serial interface (JESD204B/C) or a source synchronous parallel
+         interface (LVDS/CMOS).
+         Typically (for such devices) SPI will be used for configuration only,
+         while this IP core handles the streaming of data into memory via DMA.
+         Link: https://wiki.analog.com/resources/fpga/docs/axi_adc_ip
+         If unsure, say N (but it's safe to say "Y").
+         To compile this driver as a module, choose M here: the
+         module will be called adi-axi-adc.
  config ASPEED_ADC
        tristate "Aspeed ADC"
        depends on ARCH_ASPEED || COMPILE_TEST
@@@ -595,6 -630,16 +630,16 @@@ config MAX111
          To compile this driver as a module, choose M here: the module will be
          called max1118.
  
+ config MAX1241
+       tristate "Maxim max1241 ADC driver"
+       depends on SPI_MASTER
+       help
+         Say yes here to build support for Maxim max1241 12-bit, single-channel
+         ADC.
+         To compile this driver as a module, choose M here: the module will be
+         called max1241.
  config MAX1363
        tristate "Maxim max1363 ADC driver"
        depends on I2C
@@@ -692,16 -737,6 +737,16 @@@ config MESON_SARAD
          To compile this driver as a module, choose M here: the
          module will be called meson_saradc.
  
 +config MP2629_ADC
 +      tristate "Monolithic MP2629 ADC driver"
 +      depends on MFD_MP2629
 +      help
 +        Say yes to have support for battery charger IC MP2629 ADC device
 +        accessed over I2C.
 +
 +        This driver provides ADC conversion of system, input power supply
 +        and battery voltage & current information.
 +
  config NAU7802
        tristate "Nuvoton NAU7802 ADC driver"
        depends on I2C
diff --combined drivers/iio/adc/Makefile
index 78a1963a14f37c64fa3a79f782219b3b33aecd9f,2f5bc224412b6e2519a0a7d4fc9d3d802238e485..90f94ada7b30b75eeeda36e23253052011bd3b63
@@@ -26,6 -26,8 +26,8 @@@ obj-$(CONFIG_AD7793) += ad7793.
  obj-$(CONFIG_AD7887) += ad7887.o
  obj-$(CONFIG_AD7949) += ad7949.o
  obj-$(CONFIG_AD799X) += ad799x.o
+ obj-$(CONFIG_AD9467) += ad9467.o
+ obj-$(CONFIG_ADI_AXI_ADC) += adi-axi-adc.o
  obj-$(CONFIG_ASPEED_ADC) += aspeed_adc.o
  obj-$(CONFIG_AT91_ADC) += at91_adc.o
  obj-$(CONFIG_AT91_SAMA5D2_ADC) += at91-sama5d2_adc.o
@@@ -57,6 -59,7 +59,7 @@@ obj-$(CONFIG_LTC2497) += ltc2497.o ltc2
  obj-$(CONFIG_MAX1027) += max1027.o
  obj-$(CONFIG_MAX11100) += max11100.o
  obj-$(CONFIG_MAX1118) += max1118.o
+ obj-$(CONFIG_MAX1241) += max1241.o
  obj-$(CONFIG_MAX1363) += max1363.o
  obj-$(CONFIG_MAX9611) += max9611.o
  obj-$(CONFIG_MCP320X) += mcp320x.o
@@@ -65,7 -68,6 +68,7 @@@ obj-$(CONFIG_MCP3911) += mcp3911.
  obj-$(CONFIG_MEDIATEK_MT6577_AUXADC) += mt6577_auxadc.o
  obj-$(CONFIG_MEN_Z188_ADC) += men_z188_adc.o
  obj-$(CONFIG_MESON_SARADC) += meson_saradc.o
 +obj-$(CONFIG_MP2629_ADC) += mp2629_adc.o
  obj-$(CONFIG_MXS_LRADC_ADC) += mxs-lradc-adc.o
  obj-$(CONFIG_NAU7802) += nau7802.o
  obj-$(CONFIG_NPCM_ADC) += npcm_adc.o
diff --combined drivers/iio/dac/ad5761.c
index 7468fbd11684357ec64e0543a5a6e683eed1fce3,67179944e5c5958a5ae708103f2f38ae7e5de10f..67c4fa75c6f13e0db1ce0b5c36a45f447a1e1b2e
@@@ -3,7 -3,7 +3,7 @@@
   * AD5721, AD5721R, AD5761, AD5761R, Voltage Output Digital to Analog Converter
   *
   * Copyright 2016 Qtechnology A/S
 - * 2016 Ricardo Ribalda <ri[email protected]>
 + * 2016 Ricardo Ribalda <ri[email protected]>
   */
  #include <linux/kernel.h>
  #include <linux/module.h>
@@@ -57,11 -57,13 +57,13 @@@ enum ad5761_supported_device_ids 
   * @use_intref:               true when the internal voltage reference is used
   * @vref:             actual voltage reference in mVolts
   * @range:            output range mode used
+  * @lock              lock to protect the data buffer during SPI ops
   * @data:             cache aligned spi buffer
   */
  struct ad5761_state {
        struct spi_device               *spi;
        struct regulator                *vref_reg;
+       struct mutex                    lock;
  
        bool use_intref;
        int vref;
@@@ -124,9 -126,9 +126,9 @@@ static int ad5761_spi_write(struct iio_
        struct ad5761_state *st = iio_priv(indio_dev);
        int ret;
  
-       mutex_lock(&indio_dev->mlock);
+       mutex_lock(&st->lock);
        ret = _ad5761_spi_write(st, addr, val);
-       mutex_unlock(&indio_dev->mlock);
+       mutex_unlock(&st->lock);
  
        return ret;
  }
@@@ -163,9 -165,9 +165,9 @@@ static int ad5761_spi_read(struct iio_d
        struct ad5761_state *st = iio_priv(indio_dev);
        int ret;
  
-       mutex_lock(&indio_dev->mlock);
+       mutex_lock(&st->lock);
        ret = _ad5761_spi_read(st, addr, val);
-       mutex_unlock(&indio_dev->mlock);
+       mutex_unlock(&st->lock);
  
        return ret;
  }
@@@ -368,6 -370,8 +370,8 @@@ static int ad5761_probe(struct spi_devi
        if (pdata)
                voltage_range = pdata->voltage_range;
  
+       mutex_init(&st->lock);
        ret = ad5761_spi_set_range(st, voltage_range);
        if (ret)
                goto disable_regulator_err;
@@@ -423,6 -427,6 +427,6 @@@ static struct spi_driver ad5761_driver 
  };
  module_spi_driver(ad5761_driver);
  
 -MODULE_AUTHOR("Ricardo Ribalda <ri[email protected]>");
 +MODULE_AUTHOR("Ricardo Ribalda <ri[email protected]>");
  MODULE_DESCRIPTION("Analog Devices AD5721, AD5721R, AD5761, AD5761R driver");
  MODULE_LICENSE("GPL v2");
index 7c8f18f55122e79f12e8a863c34051a1026f29e7,1d54a0dba347fd9b2d71527d41e875f01b90a7fc..9b3631a654c895a6b1ae70d93cf69eae6bd469d6
@@@ -18,7 -18,7 +18,7 @@@ struct comedi_subdevice
  struct device;
  
  int do_rangeinfo_ioctl(struct comedi_device *dev,
 -                     struct comedi_rangeinfo __user *arg);
 +                     struct comedi_rangeinfo *it);
  struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device);
  void comedi_release_hardware_device(struct device *hardware_device);
  int comedi_alloc_subdevice_minor(struct comedi_subdevice *s);
@@@ -32,8 -32,8 +32,8 @@@ void comedi_buf_map_get(struct comedi_b
  int comedi_buf_map_put(struct comedi_buf_map *bm);
  int comedi_buf_map_access(struct comedi_buf_map *bm, unsigned long offset,
                          void *buf, int len, int write);
- struct comedi_buf_map *comedi_buf_map_from_subdev_get(
              struct comedi_subdevice *s);
+ struct comedi_buf_map *
comedi_buf_map_from_subdev_get(struct comedi_subdevice *s);
  unsigned int comedi_buf_write_n_available(struct comedi_subdevice *s);
  unsigned int comedi_buf_write_n_allocated(struct comedi_subdevice *s);
  void comedi_device_cancel_all(struct comedi_device *dev);
index cd31ad2b8a7b74f7d95344f83024ad0f13559f8e,7977845de28ad8aa51fbc42daaf636a5434be31b..2fb80b6eb51d265735a25e84ce029541357f8106
@@@ -98,7 -98,7 +98,7 @@@ static struct ieee80211_channel rtw_2gh
  
  static void rtw_2g_channels_init(struct ieee80211_channel *channels)
  {
-       memcpy((void*)channels, (void*)rtw_2ghz_channels,
+       memcpy((void *)channels, (void *)rtw_2ghz_channels,
                sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM
        );
  }
@@@ -133,8 -133,8 +133,8 @@@ static struct ieee80211_supported_band 
        if (!spt_band)
                goto exit;
  
-       spt_band->channels = (struct ieee80211_channel*)(((u8 *)spt_band)+sizeof(struct ieee80211_supported_band));
-       spt_band->bitrates = (struct ieee80211_rate*)(((u8 *)spt_band->channels)+sizeof(struct ieee80211_channel)*n_channels);
+       spt_band->channels = (struct ieee80211_channel *)(((u8 *)spt_band)+sizeof(struct ieee80211_supported_band));
+       spt_band->bitrates = (struct ieee80211_rate *)(((u8 *)spt_band->channels)+sizeof(struct ieee80211_channel)*n_channels);
        spt_band->band = band;
        spt_band->n_channels = n_channels;
        spt_band->n_bitrates = n_bitrates;
@@@ -152,22 -152,6 +152,6 @@@ exit
        return spt_band;
  }
  
- static void rtw_spt_band_free(struct ieee80211_supported_band *spt_band)
- {
-       u32 size = 0;
-       if (!spt_band)
-               return;
-       if (spt_band->band == NL80211_BAND_2GHZ)
-       {
-               size = sizeof(struct ieee80211_supported_band)
-                       + sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM
-                       + sizeof(struct ieee80211_rate)*RTW_G_RATES_NUM;
-       }
-       kfree(spt_band);
- }
  static const struct ieee80211_txrx_stypes
  rtw_cfg80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
        [NL80211_IFTYPE_ADHOC] = {
@@@ -358,7 -342,7 +342,7 @@@ struct cfg80211_bss *rtw_cfg80211_infor
        memcpy(pbuf, pnetwork->network.IEs, pnetwork->network.IELength);
        len += pnetwork->network.IELength;
  
-       *((__le64*)pbuf) = cpu_to_le64(notify_timestamp);
+       *((__le64 *)pbuf) = cpu_to_le64(notify_timestamp);
  
        bss = cfg80211_inform_bss_frame(wiphy, notify_channel, (struct ieee80211_mgmt *)buf,
                len, notify_signal, GFP_ATOMIC);
@@@ -1129,7 -1113,7 +1113,7 @@@ static int cfg80211_rtw_add_key(struct 
        else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
        {
                if (mac_addr)
-                       memcpy(param->sta_addr, (void*)mac_addr, ETH_ALEN);
+                       memcpy(param->sta_addr, (void *)mac_addr, ETH_ALEN);
  
                ret = rtw_cfg80211_ap_set_encryption(ndev, param, param_len);
        }
@@@ -2485,7 -2469,7 +2469,7 @@@ static netdev_tx_t rtw_cfg80211_monitor
                 * for two MAC addresses
                 */
                skb_pull(skb, dot11_hdr_len + qos_len + snap_len - sizeof(src_mac_addr) * 2);
-               pdata = (unsigned char*)skb->data;
+               pdata = (unsigned char *)skb->data;
                memcpy(pdata, dst_mac_addr, sizeof(dst_mac_addr));
                memcpy(pdata + sizeof(dst_mac_addr), src_mac_addr, sizeof(src_mac_addr));
  
  
                pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
  
-               memcpy(pframe, (void*)buf, len);
+               memcpy(pframe, (void *)buf, len);
                pattrib->pktlen = len;
  
                pwlanhdr = (struct ieee80211_hdr *)pframe;
@@@ -3030,7 -3014,7 +3014,7 @@@ static int _cfg80211_rtw_mgmt_tx(struc
  
        pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
  
-       memcpy(pframe, (void*)buf, len);
+       memcpy(pframe, (void *)buf, len);
        pattrib->pktlen = len;
  
        pwlanhdr = (struct ieee80211_hdr *)pframe;
@@@ -3163,6 -3147,29 +3147,6 @@@ exit
        return ret;
  }
  
 -static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
 -      struct wireless_dev *wdev,
 -      u16 frame_type, bool reg)
 -{
 -      struct net_device *ndev = wdev_to_ndev(wdev);
 -      struct adapter *adapter;
 -
 -      if (ndev == NULL)
 -              goto exit;
 -
 -      adapter = (struct adapter *)rtw_netdev_priv(ndev);
 -
 -#ifdef DEBUG_CFG80211
 -      DBG_871X(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter),
 -              frame_type, reg);
 -#endif
 -
 -      if (frame_type != (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ))
 -              return;
 -exit:
 -      return;
 -}
 -
  #if defined(CONFIG_PNO_SUPPORT)
  static int cfg80211_rtw_sched_scan_start(struct wiphy *wiphy,
                struct net_device *dev,
@@@ -3374,6 -3381,7 +3358,6 @@@ static struct cfg80211_ops rtw_cfg80211
        .change_bss = cfg80211_rtw_change_bss,
  
        .mgmt_tx = cfg80211_rtw_mgmt_tx,
 -      .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
  
  #if defined(CONFIG_PNO_SUPPORT)
        .sched_scan_start = cfg80211_rtw_sched_scan_start,
@@@ -3463,7 -3471,7 +3447,7 @@@ void rtw_wdev_free(struct wireless_dev 
        if (!wdev)
                return;
  
-       rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_2GHZ]);
+       kfree(wdev->wiphy->bands[NL80211_BAND_2GHZ]);
  
        wiphy_free(wdev->wiphy);
  
This page took 0.234298 seconds and 4 git commands to generate.