git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8e4ff71 c1157f6)
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2019 21:50:09 +0000 (14:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2019 21:50:09 +0000 (14:50 -0700)
Pull clk framework updates from Stephen Boyd:
 "We have a couple new features and changes in the core clk framework
  this time around because we've finally gotten around to fixing some
  long standing issues. There's still work to do though, so this pull
  request is largely laying down the foundation for all the driver
  changes to come in the next merge window.

  The first problem we're alleviating is how parents of clks are
  specified. With the new method, we should see lots of drivers migrate
  away from the current design of string comparisons on the entire clk
  tree to a more direct method where they can use clk_hw pointers or
  more localized names specified in DT or via clkdev. This should reduce
  our reliance on string comparisons for all the topology description
  logic that we've been using for years and hopefully speed some things
  up while avoiding problems we have with generating clk names.

  Beyond that we also got rid of the CLK_IS_BASIC flag because it wasn't
  really helping anyone and we introduced big-endian versions of the
  basic clk types so that we can get rid of clk_{readl,writel}(). Both
  of these are things that driver developers have tried to use over the
  years that I typically bat away during code reviews because they're
  not useful. It's great to see these two things go away so maintainers
  can save time not worrying about these things.

  On the driver side we got the usual collection of new SoC support and
  non-critical fixes and updates to existing code. The big topics that
  stand out are the new driver support for Mediatek MT8183 and MT8516
  SoCs, Amlogic Meson8b and G12a SoCs, and the SiFive FU540 SoC. The
  other patches in the driver pile are mostly fixes for things that are
  being used for the first time or additions for clks that couldn't be
  tested before because there wasn't a consumer driver that exercised
  them. Details are below and also in the sub-maintainer tags.

  Core:
   - Remove clk_readl() and introduce BE versions of basic clk types
   - Rewrite how clk parents can be specified to allow DT/clkdev lookups
   - Removal of the CLK_IS_BASIC clk flag
   - Framework documentation updates and fixes

  New Drivers:
   - Support for STM32F769
   - AT91 sam9x60 PMC support
   - SiFive FU540 PRCI and PLL support
   - Qualcomm QCS404 CDSP clk support
   - Qualcomm QCS404 Turing clk support
   - Mediatek MT8183 clock support
   - Mediatek MT8516 clock support
   - Milbeaut M10V clk controller support
   - Support for Cirrus Logic Lochnagar clks

  Updates:
   - Rework AT91 sckc DT bindings
   - Fix slow RC oscillator issue on sama5d3
   - Mark UFS clk as critical on Hi-Silicon hi3660 SoCs
   - Various static analysis fixes/finds and const markings
   - Video Engine (ECLK) support on Aspeed SoCs
   - Xilinx ZynqMP Versal platform support
   - Convert Xilinx ZynqMP driver to be struct oriented
   - Fixes for Rockchip rk3328 and rk3288 SoCs
   - Sub-type for Rockchip SoCs where mux and divider aren't a single register
   - Remove SNVS clock from i.MX7UPL clock driver and bindings
   - Improve i.MX5 clock driver for i.MX50 support
   - Addition of ADC clock definition for Exynos 5410 SoC (Odroid XU)
   - Export a new clock for the MBUS controller on the A13
   - Allwinner H6 fixes to support a finer clocking of the video and VPU engines
   - Add g12a support in the Amlogic axg audio clock controller
   - Add missing PCI USB clock on Rensas RZ/N1
   - Add Z2 (Cortex-A53) clocks on Rensas R-Car E3 and RZ/G2E
   - A new helper DIV64_U64_ROUND_CLOSEST() in <linux/math64.h>
   - VPU and Video Decoder clocks on Amlogic Meson8b
   - Finally remove the wrong ABP Meson8b clock id
   - Add Video Decoder, PCIe PLL, and CPU Clocks on Amlogic G12A
   - Re-expose SAR_ADC_SEL and CTS_OSCIN on Amlogic G12A AO clock controller
   - Un-expose some Amlogic AXG-Audio input clocks IDs"

* tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (172 commits)
  clk: Cache core in clk_fetch_parent_index() without names
  clk: imx: correct pfdv2 gate_bit/vld_bit operations
  clk: sifive: add a driver for the SiFive FU540 PRCI IP block
  clk: analogbits: add Wide-Range PLL library
  clk: imx: clk-pllv3: mark expected switch fall-throughs
  clk: imx8mq: Add dsi_ipg_div
  clk: imx: pllv4: add fractional-N pll support
  clk: sunxi-ng: Use the correct style for SPDX License Identifier
  clk: sprd: Use the correct style for SPDX License Identifier
  clk: renesas: Use the correct style for SPDX License Identifier
  clk: qcom: Use the correct style for SPDX License Identifier
  clk: davinci: Use the correct style for SPDX License Identifier
  clk: actions: Use the correct style for SPDX License Identifier
  clk: imx: keep uart clock on during system boot
  clk: imx: correct i.MX7D AV PLL num/denom offset
  dt-bindings: clk: add documentation for the SiFive PRCI driver
  clk: stm32mp1: Add ddrperfm clock
  clk: Remove CLK_IS_BASIC clk flag
  clock: milbeaut: Add Milbeaut M10V clock controller
  dt-bindings: clock: milbeaut: add Milbeaut clock description
  ...

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
include/linux/device.h patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index a3143515e134502b1c7972d31d40498a00c1a45b,562018c00e22cdf16609256ab4e0a1dfa0a9f80a..960070e36bd9d0ed1bec79a63644d1b9c0e432f0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -268,13 -268,12 +268,13 @@@ L:      linux-gpio@vger.kernel.or
  S:    Maintained
  F:    drivers/gpio/gpio-104-idio-16.c
  
 -ACCES 104-QUAD-8 IIO DRIVER
 +ACCES 104-QUAD-8 DRIVER
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
  F:    Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
 -F:    drivers/iio/counter/104-quad-8.c
 +F:    drivers/counter/104-quad-8.c
  
  ACCES PCI-IDIO-16 GPIO DRIVER
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
@@@ -469,7 -468,7 +469,7 @@@ ADM1025 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/adm1025
 +F:    Documentation/hwmon/adm1025.rst
  F:    drivers/hwmon/adm1025.c
  
  ADM1029 HARDWARE MONITOR DRIVER
@@@ -521,7 -520,7 +521,7 @@@ ADS1015 HARDWARE MONITOR DRIVE
  M:    Dirk Eibach <eibach@gdsys.de>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/ads1015
 +F:    Documentation/hwmon/ads1015.rst
  F:    drivers/hwmon/ads1015.c
  F:    include/linux/platform_data/ads1015.h
  
@@@ -534,7 -533,7 +534,7 @@@ ADT7475 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/adt7475
 +F:    Documentation/hwmon/adt7475.rst
  F:    drivers/hwmon/adt7475.c
  
  ADVANSYS SCSI DRIVER
@@@ -745,15 -744,6 +745,15 @@@ S:       Supporte
  F:    Documentation/networking/device_drivers/amazon/ena.txt
  F:    drivers/net/ethernet/amazon/
  
 +AMAZON RDMA EFA DRIVER
 +M:    Gal Pressman <galpress@amazon.com>
 +R:    Yossi Leybovich <sleybo@amazon.com>
 +L:    linux-rdma@vger.kernel.org
 +Q:    https://patchwork.kernel.org/project/linux-rdma/list/
 +S:    Supported
 +F:    drivers/infiniband/hw/efa/
 +F:    include/uapi/rdma/efa-abi.h
 +
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
  M:    Tom Lendacky <thomas.lendacky@amd.com>
  M:    Gary Hook <gary.hook@amd.com>
@@@ -774,7 -764,7 +774,7 @@@ AMD FAM15H PROCESSOR POWER MONITORING D
  M:    Huang Rui <ray.huang@amd.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
 -F:    Documentation/hwmon/fam15h_power
 +F:    Documentation/hwmon/fam15h_power.rst
  F:    drivers/hwmon/fam15h_power.c
  
  AMD FCH GPIO DRIVER
@@@ -826,14 -816,6 +826,14 @@@ F:       drivers/gpu/drm/amd/include/vi_struc
  F:    drivers/gpu/drm/amd/include/v9_structs.h
  F:    include/uapi/linux/kfd_ioctl.h
  
 +AMD MP2 I2C DRIVER
 +M:    Elie Morisse <syniurge@gmail.com>
 +M:    Nehal Shah <nehal-bakulchandra.shah@amd.com>
 +M:    Shyam Sundar S K <shyam-sundar.s-k@amd.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-amd-mp2*
 +
  AMD POWERPLAY
  M:    Rex Zhu <rex.zhu@amd.com>
  M:    Evan Quan <evan.quan@amd.com>
@@@ -886,7 -868,7 +886,7 @@@ L: linux-iio@vger.kernel.or
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/iio/adc/ad7606.c
 -F:    Documentation/devicetree/bindings/iio/adc/ad7606.txt
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt
  
  ANALOG DEVICES INC AD7768-1 DRIVER
  M:    Stefan Popa <stefan.popa@analog.com>
@@@ -968,7 -950,6 +968,7 @@@ F: drivers/dma/dma-axi-dmac.
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
  M:    Michael Hennerich <Michael.Hennerich@analog.com>
 +M:    Stefan Popa <stefan.popa@analog.com>
  W:    http://wiki.analog.com/
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
@@@ -979,6 -960,12 +979,12 @@@ F:       drivers/iio/adc/ltc2497
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
  
+ ANALOGBITS PLL LIBRARIES
+ M:    Paul Walmsley <paul.walmsley@sifive.com>
+ S:    Supported
+ F:    drivers/clk/analogbits/*
+ F:    include/linux/clk/analogbits*
+ 
  ANDES ARCHITECTURE
  M:    Greentime Hu <green.hu@gmail.com>
  M:    Vincent Chen <deanbo422@gmail.com>
@@@ -1186,7 -1173,7 +1192,7 @@@ S:      Supporte
  T:    git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
  F:    drivers/gpu/drm/arm/display/include/
  F:    drivers/gpu/drm/arm/display/komeda/
 -F:    Documentation/devicetree/bindings/display/arm/arm,komeda.txt
 +F:    Documentation/devicetree/bindings/display/arm,komeda.txt
  F:    Documentation/gpu/komeda-kms.rst
  
  ARM MALI-DP DRM DRIVER
@@@ -1199,15 -1186,6 +1205,15 @@@ F:    drivers/gpu/drm/arm
  F:    Documentation/devicetree/bindings/display/arm,malidp.txt
  F:    Documentation/gpu/afbc.rst
  
 +ARM MALI PANFROST DRM DRIVER
 +M:    Rob Herring <robh@kernel.org>
 +M:    Tomeu Vizoso <tomeu.vizoso@collabora.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/panfrost/
 +F:    include/uapi/drm/panfrost_drm.h
 +
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <spyro@f2s.com>
  S:    Maintained
@@@ -1444,9 -1422,7 +1450,9 @@@ M:      Manivannan Sadhasivam <manivannan.sa
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/bitmain/
 +F:    drivers/pinctrl/pinctrl-bm1880.c
  F:    Documentation/devicetree/bindings/arm/bitmain.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <robh@kernel.org>
@@@ -2543,7 -2519,7 +2549,7 @@@ ASC7621 HARDWARE MONITOR DRIVE
  M:    George Joseph <george.joseph@fairview5.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/asc7621
 +F:    Documentation/hwmon/asc7621.rst
  F:    drivers/hwmon/asc7621.c
  
  ASPEED VIDEO ENGINE DRIVER
@@@ -2590,7 -2566,7 +2596,7 @@@ F:      include/linux/dmaengine.
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
 -M:    Bartosz Golaszewski <brgl@bgdev.pl>
 +M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
  L:    linux-i2c@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
  S:    Maintained
@@@ -2824,13 -2800,10 +2830,13 @@@ M:   Simon Wunderlich <sw@simonwunderlich
  M:    Antonio Quartulli <a@unstable.cc>
  L:    b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)
  W:    https://www.open-mesh.org/
 +B:    https://www.open-mesh.org/projects/batman-adv/issues
 +C:    irc://chat.freenode.net/batman
  Q:    https://patchwork.open-mesh.org/project/batman/list/
 +T:    git https://git.open-mesh.org/linux-merge.git
  S:    Maintained
 -F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
 -F:    Documentation/ABI/testing/sysfs-class-net-mesh
 +F:    Documentation/ABI/obsolete/sysfs-class-net-batman-adv
 +F:    Documentation/ABI/obsolete/sysfs-class-net-mesh
  F:    Documentation/networking/batman-adv.rst
  F:    include/uapi/linux/batadv_packet.h
  F:    include/uapi/linux/batman_adv.h
@@@ -3386,7 -3359,7 +3392,7 @@@ F:      include/uapi/linux/bsg.
  BT87X AUDIO DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -T:    git git://git.alsa-project.org/alsa-kernel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    Documentation/sound/cards/bt87x.rst
  F:    sound/pci/bt87x.c
@@@ -3439,7 -3412,7 +3445,7 @@@ F:      drivers/scsi/FlashPoint.
  C-MEDIA CMI8788 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -T:    git git://git.alsa-project.org/alsa-kernel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/pci/oxygen/
  
@@@ -3763,8 -3736,8 +3769,8 @@@ F:      scripts/checkpatch.p
  
  CHINESE DOCUMENTATION
  M:    Harry Wei <harryxiyou@gmail.com>
 +M:    Alex Shi <alex.shi@linux.alibaba.com>
  L:    xiyoulinuxkernelgroup@googlegroups.com (subscribers-only)
 -L:    linux-kernel@zh-kernel.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/translations/zh_CN/
  
@@@ -3831,21 -3804,16 +3837,21 @@@ M:   Richard Fitzgerald <rf@opensource.ci
  L:    patches@opensource.cirrus.com
  S:    Supported
  F:    drivers/clk/clk-lochnagar.c
 +F:    drivers/hwmon/lochnagar-hwmon.c
  F:    drivers/mfd/lochnagar-i2c.c
  F:    drivers/pinctrl/cirrus/pinctrl-lochnagar.c
  F:    drivers/regulator/lochnagar-regulator.c
 +F:    sound/soc/codecs/lochnagar-sc.c
  F:    include/dt-bindings/clk/lochnagar.h
  F:    include/dt-bindings/pinctrl/lochnagar.h
  F:    include/linux/mfd/lochnagar*
  F:    Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
  F:    Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt
 +F:    Documentation/devicetree/bindings/hwmon/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/hwmon/lochnagar
  
  CISCO FCOE HBA DRIVER
  M:    Satish Kharat <satishkh@cisco.com>
@@@ -4083,7 -4051,7 +4089,7 @@@ CORETEMP HARDWARE MONITORING DRIVE
  M:    Fenghua Yu <fenghua.yu@intel.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/coretemp
 +F:    Documentation/hwmon/coretemp.rst
  F:    drivers/hwmon/coretemp.c
  
  COSA/SRP SYNC SERIAL DRIVER
@@@ -4092,16 -4060,6 +4098,16 @@@ W:    http://www.fi.muni.cz/~kas/cosa
  S:    Maintained
  F:    drivers/net/wan/cosa*
  
 +COUNTER SUBSYSTEM
 +M:    William Breathitt Gray <vilhelm.gray@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-counter*
 +F:    Documentation/driver-api/generic-counter.rst
 +F:    drivers/counter/
 +F:    include/linux/counter.h
 +F:    include/linux/counter_enum.h
 +
  CPMAC ETHERNET DRIVER
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    netdev@vger.kernel.org
@@@ -4296,7 -4254,7 +4302,7 @@@ S:      Supporte
  F:    drivers/scsi/cxgbi/cxgb3i
  
  CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
 -M:    Steve Wise <swise@chelsio.com>
 +M:    Potnuri Bharat Teja <bharat@chelsio.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openfabrics.org
  S:    Supported
@@@ -4325,7 -4283,7 +4331,7 @@@ S:      Supporte
  F:    drivers/scsi/cxgbi/cxgb4i
  
  CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
 -M:    Steve Wise <swise@chelsio.com>
 +M:    Potnuri Bharat Teja <bharat@chelsio.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openfabrics.org
  S:    Supported
@@@ -4601,7 -4559,6 +4607,7 @@@ S:      Maintaine
  F:    drivers/devfreq/
  F:    include/linux/devfreq.h
  F:    Documentation/devicetree/bindings/devfreq/
 +F:    include/trace/events/devfreq.h
  
  DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
  M:    Chanwoo Choi <cw00.choi@samsung.com>
@@@ -4649,7 -4606,7 +4655,7 @@@ DIALOG SEMICONDUCTOR DRIVER
  M:    Support Opensource <support.opensource@diasemi.com>
  W:    http://www.dialog-semiconductor.com/products
  S:    Supported
 -F:    Documentation/hwmon/da90??
 +F:    Documentation/hwmon/da90??.rst
  F:    Documentation/devicetree/bindings/mfd/da90*.txt
  F:    Documentation/devicetree/bindings/input/da90??-onkey.txt
  F:    Documentation/devicetree/bindings/thermal/da90??-thermal.txt
@@@ -4800,7 -4757,7 +4806,7 @@@ DME1737 HARDWARE MONITOR DRIVE
  M:    Juerg Haefliger <juergh@gmail.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/dme1737
 +F:    Documentation/hwmon/dme1737.rst
  F:    drivers/hwmon/dme1737.c
  
  DMI/SMBIOS SUPPORT
@@@ -4945,14 -4902,6 +4951,14 @@@ M:    Dave Airlie <airlied@redhat.com
  S:    Odd Fixes
  F:    drivers/gpu/drm/ast/
  
 +DRM DRIVER FOR ASPEED BMC GFX
 +M:    Joel Stanley <joel@jms.id.au>
 +L:    linux-aspeed@lists.ozlabs.org
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Supported
 +F:    drivers/gpu/drm/aspeed/
 +F:    Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
 +
  DRM DRIVER FOR BOCHS VIRTUAL GPU
  M:    Gerd Hoffmann <kraxel@redhat.com>
  L:    virtualization@lists.linux-foundation.org
@@@ -4966,12 -4915,6 +4972,12 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/tve200/
  
 +DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
 +M:    Jagan Teki <jagan@amarulasolutions.com>
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
 +F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
 +
  DRM DRIVER FOR ILITEK ILI9225 PANELS
  M:    David Lechner <david@lechnology.com>
  S:    Maintained
@@@ -5063,12 -5006,6 +5069,12 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/r128/
  F:    include/uapi/drm/r128_drm.h
  
 +DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
 +M:    Guido Günther <agx@sigxcpu.org>
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
 +F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
 +
  DRM DRIVER FOR SAVAGE VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/savage/
@@@ -5116,13 -5053,6 +5122,13 @@@ S:    Odd Fixe
  F:    drivers/gpu/drm/udl/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 +DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +F:    drivers/gpu/drm/vboxvideo/
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
  M:    Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
  R:    Haneen Mohammed <hamohammed.sa@gmail.com>
@@@ -5257,15 -5187,6 +5263,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/hisilicon/
  F:    Documentation/devicetree/bindings/display/hisilicon/
  
 +DRM DRIVERS FOR LIMA
 +M:    Qiang Yu <yuq825@gmail.com>
 +L:    dri-devel@lists.freedesktop.org
 +L:    lima@lists.freedesktop.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/gpu/drm/lima/
 +F:    include/uapi/drm/lima_drm.h
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DRM DRIVERS FOR MEDIATEK
  M:    CK Hu <ck.hu@mediatek.com>
  M:    Philipp Zabel <p.zabel@pengutronix.de>
@@@ -5683,12 -5604,6 +5689,12 @@@ L:    linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/ghes_edac.c
  
 +EDAC-I10NM
 +M:    Tony Luck <tony.luck@intel.com>
 +L:    linux-edac@vger.kernel.org
 +S:    Maintained
 +F:    drivers/edac/i10nm_base.c
 +
  EDAC-I3000
  L:    linux-edac@vger.kernel.org
  S:    Orphan
@@@ -5770,7 -5685,7 +5776,7 @@@ EDAC-SKYLAK
  M:    Tony Luck <tony.luck@intel.com>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
 -F:    drivers/edac/skx_edac.c
 +F:    drivers/edac/skx_*.c
  
  EDAC-TI
  M:    Tero Kristo <t-kristo@ti.com>
@@@ -5789,7 -5704,7 +5795,7 @@@ F:      drivers/edac/qcom_edac.
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -T:    git git://git.alsa-project.org/alsa-kernel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/usb/misc/ua101.c
  
@@@ -6028,7 -5943,7 +6034,7 @@@ F71805F HARDWARE MONITORING DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/f71805f
 +F:    Documentation/hwmon/f71805f.rst
  F:    drivers/hwmon/f71805f.c
  
  FADDR2LINE
@@@ -6129,7 -6044,7 +6135,7 @@@ F:      include/linux/f75375s.
  FIREWIRE AUDIO DRIVERS
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -T:    git git://git.alsa-project.org/alsa-kernel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/firewire/
  
@@@ -6685,7 -6600,7 +6691,7 @@@ M:      Andy Shevchenko <andriy.shevchenko@l
  L:    linux-gpio@vger.kernel.org
  L:    linux-acpi@vger.kernel.org
  S:    Maintained
 -F:    Documentation/acpi/gpio-properties.txt
 +F:    Documentation/firmware-guide/acpi/gpio-properties.rst
  F:    drivers/gpio/gpiolib-acpi.c
  
  GPIO IR Transmitter
@@@ -7709,7 -7624,7 +7715,7 @@@ INA209 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/ina209
 +F:    Documentation/hwmon/ina209.rst
  F:    Documentation/devicetree/bindings/hwmon/ina2xx.txt
  F:    drivers/hwmon/ina209.c
  
@@@ -7717,7 -7632,7 +7723,7 @@@ INA2XX HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/ina2xx
 +F:    Documentation/hwmon/ina2xx.rst
  F:    drivers/hwmon/ina2xx.c
  F:    include/linux/platform_data/ina2xx.h
  
@@@ -7744,10 -7659,6 +7750,10 @@@ F:    drivers/infiniband
  F:    include/uapi/linux/if_infiniband.h
  F:    include/uapi/rdma/
  F:    include/rdma/
 +F:    include/trace/events/ib_mad.h
 +F:    include/trace/events/ib_umad.h
 +F:    samples/bpf/ibumad_kern.c
 +F:    samples/bpf/ibumad_user.c
  
  INGENIC JZ4780 DMA Driver
  M:    Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
@@@ -8141,7 -8052,6 +8147,7 @@@ F:      drivers/gpio/gpio-intel-mid.
  
  INTERCONNECT API
  M:    Georgi Djakov <georgi.djakov@linaro.org>
 +L:    linux-pm@vger.kernel.org
  S:    Maintained
  F:    Documentation/interconnect/
  F:    Documentation/devicetree/bindings/interconnect/
@@@ -8350,7 -8260,7 +8356,7 @@@ IT87 HARDWARE MONITORING DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/it87
 +F:    Documentation/hwmon/it87.rst
  F:    drivers/hwmon/it87.c
  
  IT913X MEDIA DRIVER
@@@ -8394,7 -8304,7 +8400,7 @@@ M:      Guenter Roeck <linux@roeck-us.net
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
  F:    drivers/hwmon/jc42.c
 -F:    Documentation/hwmon/jc42
 +F:    Documentation/hwmon/jc42.rst
  
  JFS FILESYSTEM
  M:    Dave Kleikamp <shaggy@kernel.org>
@@@ -8442,14 -8352,14 +8448,14 @@@ K10TEMP HARDWARE MONITORING DRIVE
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/k10temp
 +F:    Documentation/hwmon/k10temp.rst
  F:    drivers/hwmon/k10temp.c
  
  K8TEMP HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <r.marek@assembler.cz>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/k8temp
 +F:    Documentation/hwmon/k8temp.rst
  F:    drivers/hwmon/k8temp.c
  
  KASAN
@@@ -9090,7 -9000,7 +9096,7 @@@ R:      Daniel Lustig <dlustig@nvidia.com
  L:    linux-kernel@vger.kernel.org
  L:    linux-arch@vger.kernel.org
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    tools/memory-model/
  F:    Documentation/atomic_bitops.txt
  F:    Documentation/atomic_t.txt
@@@ -9141,21 -9051,21 +9147,21 @@@ LM78 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/lm78
 +F:    Documentation/hwmon/lm78.rst
  F:    drivers/hwmon/lm78.c
  
  LM83 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/lm83
 +F:    Documentation/hwmon/lm83.rst
  F:    drivers/hwmon/lm83.c
  
  LM90 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/lm90
 +F:    Documentation/hwmon/lm90.rst
  F:    Documentation/devicetree/bindings/hwmon/lm90.txt
  F:    drivers/hwmon/lm90.c
  F:    include/dt-bindings/thermal/lm90.h
@@@ -9164,7 -9074,7 +9170,7 @@@ LM95234 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/lm95234
 +F:    Documentation/hwmon/lm95234.rst
  F:    drivers/hwmon/lm95234.c
  
  LME2510 MEDIA DRIVER
@@@ -9196,6 -9106,7 +9202,6 @@@ F:      arch/*/include/asm/spinlock*.
  F:    include/linux/rwlock*.h
  F:    include/linux/mutex*.h
  F:    include/linux/rwsem*.h
 -F:    arch/*/include/asm/rwsem.h
  F:    include/linux/seqlock.h
  F:    lib/locking*.[ch]
  F:    kernel/locking/
@@@ -9237,7 -9148,7 +9243,7 @@@ LTC4261 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/ltc4261
 +F:    Documentation/hwmon/ltc4261.rst
  F:    drivers/hwmon/ltc4261.c
  
  LTC4306 I2C MULTIPLEXER DRIVER
@@@ -9468,7 -9379,7 +9474,7 @@@ MAX16065 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/max16065
 +F:    Documentation/hwmon/max16065.rst
  F:    drivers/hwmon/max16065.c
  
  MAX2175 SDR TUNER DRIVER
@@@ -9484,14 -9395,14 +9490,14 @@@ F:   include/uapi/linux/max2175.
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  L:    linux-hwmon@vger.kernel.org
  S:    Orphan
 -F:    Documentation/hwmon/max6650
 +F:    Documentation/hwmon/max6650.rst
  F:    drivers/hwmon/max6650.c
  
  MAX6697 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/max6697
 +F:    Documentation/hwmon/max6697.rst
  F:    Documentation/devicetree/bindings/hwmon/max6697.txt
  F:    drivers/hwmon/max6697.c
  F:    include/linux/platform_data/max6697.h
@@@ -9503,13 -9414,6 +9509,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/sound/max9860.txt
  F:    sound/soc/codecs/max9860.*
  
 +MAXBOTIX ULTRASONIC RANGER IIO DRIVER
 +M:    Andreas Klinger <ak@it-klinger.de>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
 +F:    drivers/iio/proximity/mb1232.c
 +
  MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
  M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    linux-kernel@vger.kernel.org
@@@ -9878,17 -9782,9 +9884,17 @@@ F:    drivers/media/platform/mtk-vpu
  F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
  
 +MEDIATEK MMC/SD/SDIO DRIVER
 +M:    Chaotian Jing <chaotian.jing@mediatek.com>
 +S:    Maintained
 +F:    drivers/mmc/host/mtk-sd.c
 +F:    Documentation/devicetree/bindings/mmc/mtk-sd.txt
 +
  MEDIATEK MT76 WIRELESS LAN DRIVER
  M:    Felix Fietkau <nbd@nbd.name>
  M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
 +R:    Ryder Lee <ryder.lee@mediatek.com>
 +R:    Roy Luo <royluo@google.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt76/
@@@ -9987,6 -9883,15 +9993,6 @@@ F:     drivers/net/ethernet/mellanox/mlx5/c
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
 -MELLANOX ETHERNET INNOVA IPSEC DRIVER
 -R:    Boris Pismenny <borisp@mellanox.com>
 -L:    netdev@vger.kernel.org
 -S:    Supported
 -W:    http://www.mellanox.com
 -Q:    http://patchwork.ozlabs.org/project/netdev/list/
 -F:    drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*
 -F:    drivers/net/ethernet/mellanox/mlx5/core/ipsec*
 -
  MELLANOX ETHERNET SWITCH DRIVERS
  M:    Jiri Pirko <jiri@mellanox.com>
  M:    Ido Schimmel <idosch@mellanox.com>
@@@ -10143,7 -10048,7 +10149,7 @@@ F:   drivers/mfd/menf21bmc.
  F:    drivers/watchdog/menf21bmc_wdt.c
  F:    drivers/leds/leds-menf21bmc.c
  F:    drivers/hwmon/menf21bmc_hwmon.c
 -F:    Documentation/hwmon/menf21bmc
 +F:    Documentation/hwmon/menf21bmc.rst
  
  MEN Z069 WATCHDOG DRIVER
  M:    Johannes Thumshirn <jth@kernel.org>
@@@ -10158,7 -10063,6 +10164,7 @@@ L:   linux-amlogic@lists.infradead.or
  W:    http://linux-meson.com/
  S:    Supported
  F:    drivers/media/platform/meson/ao-cec.c
 +F:    drivers/media/platform/meson/ao-cec-g12a.c
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
@@@ -10215,8 -10119,7 +10221,8 @@@ MICROCHIP I2C DRIVE
  M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-i2c@vger.kernel.org
  S:    Supported
 -F:    drivers/i2c/busses/i2c-at91.c
 +F:    drivers/i2c/busses/i2c-at91.h
 +F:    drivers/i2c/busses/i2c-at91-*.c
  
  MICROCHIP ISC DRIVER
  M:    Eugen Hristev <eugen.hristev@microchip.com>
@@@ -10538,7 -10441,7 +10544,7 @@@ F:   include/uapi/linux/meye.
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <jirislaby@gmail.com>
  S:    Maintained
 -F:    Documentation/serial/moxa-smartio
 +F:    Documentation/serial/moxa-smartio.rst
  F:    drivers/tty/mxser.*
  
  MR800 AVERMEDIA USB FM RADIO DRIVER
@@@ -10773,7 -10676,7 +10779,7 @@@ NCT6775 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/nct6775
 +F:    Documentation/hwmon/nct6775.rst
  F:    drivers/hwmon/nct6775.c
  
  NET_FAILOVER MODULE
@@@ -10851,7 -10754,6 +10857,7 @@@ L:   linux-block@vger.kernel.or
  L:    nbd@other.debian.org
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
 +F:    include/trace/events/nbd.h
  F:    include/uapi/linux/nbd.h
  
  NETWORK DROP MONITOR
@@@ -11222,16 -11124,6 +11228,16 @@@ F: Documentation/ABI/stable/sysfs-bus-n
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
 +NXP FXAS21002C DRIVER
 +M:    Rui Miguel Silva <rmfrfs@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/gyroscope/fxas21002c.txt
 +F:    drivers/iio/gyro/fxas21002c_core.c
 +F:    drivers/iio/gyro/fxas21002c.h
 +F:    drivers/iio/gyro/fxas21002c_i2c.c
 +F:    drivers/iio/gyro/fxas21002c_spi.c
 +
  NXP SGTL5000 DRIVER
  M:    Fabio Estevam <festevam@gmail.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -11239,12 -11131,6 +11245,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
  F:    sound/soc/codecs/sgtl5000*
  
 +NXP SJA1105 ETHERNET SWITCH DRIVER
 +M:    Vladimir Oltean <olteanv@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/dsa/sja1105
 +
  NXP TDA998X DRM DRIVER
  M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
@@@ -11724,7 -11610,7 +11730,7 @@@ F:   Documentation/devicetree/bindings/op
  OPL4 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -T:    git git://git.alsa-project.org/alsa-kernel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/drivers/opl4/
  
@@@ -11798,14 -11684,6 +11804,14 @@@ L: linux-i2c@vger.kernel.or
  S:    Orphan
  F:    drivers/i2c/busses/i2c-pasemi.c
  
 +PACKING
 +M:    Vladimir Oltean <olteanv@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    lib/packing.c
 +F:    include/linux/packing.h
 +F:    Documentation/packing.txt
 +
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <steffen.klassert@secunet.com>
  L:    linux-crypto@vger.kernel.org
@@@ -11892,7 -11770,7 +11898,7 @@@ PC87360 HARDWARE MONITORING DRIVE
  M:    Jim Cromie <jim.cromie@gmail.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/pc87360
 +F:    Documentation/hwmon/pc87360.rst
  F:    drivers/hwmon/pc87360.c
  
  PC8736x GPIO DRIVER
@@@ -11904,7 -11782,7 +11910,7 @@@ PC87427 HARDWARE MONITORING DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/pc87427
 +F:    Documentation/hwmon/pc87427.rst
  F:    drivers/hwmon/pc87427.c
  
  PCA9532 LED DRIVER
@@@ -12473,23 -12351,23 +12479,23 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
  F:    Documentation/devicetree/bindings/hwmon/max31785.txt
  F:    Documentation/devicetree/bindings/hwmon/ltc2978.txt
 -F:    Documentation/hwmon/adm1275
 -F:    Documentation/hwmon/ibm-cffps
 -F:    Documentation/hwmon/ir35221
 -F:    Documentation/hwmon/lm25066
 -F:    Documentation/hwmon/ltc2978
 -F:    Documentation/hwmon/ltc3815
 -F:    Documentation/hwmon/max16064
 -F:    Documentation/hwmon/max20751
 -F:    Documentation/hwmon/max31785
 -F:    Documentation/hwmon/max34440
 -F:    Documentation/hwmon/max8688
 -F:    Documentation/hwmon/pmbus
 -F:    Documentation/hwmon/pmbus-core
 -F:    Documentation/hwmon/tps40422
 -F:    Documentation/hwmon/ucd9000
 -F:    Documentation/hwmon/ucd9200
 -F:    Documentation/hwmon/zl6100
 +F:    Documentation/hwmon/adm1275.rst
 +F:    Documentation/hwmon/ibm-cffps.rst
 +F:    Documentation/hwmon/ir35221.rst
 +F:    Documentation/hwmon/lm25066.rst
 +F:    Documentation/hwmon/ltc2978.rst
 +F:    Documentation/hwmon/ltc3815.rst
 +F:    Documentation/hwmon/max16064.rst
 +F:    Documentation/hwmon/max20751.rst
 +F:    Documentation/hwmon/max31785.rst
 +F:    Documentation/hwmon/max34440.rst
 +F:    Documentation/hwmon/max8688.rst
 +F:    Documentation/hwmon/pmbus.rst
 +F:    Documentation/hwmon/pmbus-core.rst
 +F:    Documentation/hwmon/tps40422.rst
 +F:    Documentation/hwmon/ucd9000.rst
 +F:    Documentation/hwmon/ucd9200.rst
 +F:    Documentation/hwmon/zl6100.rst
  F:    drivers/hwmon/pmbus/
  F:    include/linux/pmbus.h
  
@@@ -12545,7 -12423,7 +12551,7 @@@ M:   Mark Rutland <mark.rutland@arm.com
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
 -F:    drivers/firmware/psci*.c
 +F:    drivers/firmware/psci/
  F:    include/linux/psci.h
  F:    include/uapi/linux/psci.h
  
@@@ -12753,7 -12631,7 +12759,7 @@@ M:   Bartlomiej Zolnierkiewicz <b.zolnier
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
 -F:    Documentation/hwmon/pwm-fan
 +F:    Documentation/hwmon/pwm-fan.rst
  F:    drivers/hwmon/pwm-fan.c
  
  PWM IR Transmitter
@@@ -13171,9 -13049,9 +13177,9 @@@ M:   Josh Triplett <josh@joshtriplett.org
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  R:    Lai Jiangshan <jiangshanlai@gmail.com>
 -L:    linux-kernel@vger.kernel.org
 +L:    rcu@vger.kernel.org
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    tools/testing/selftests/rcutorture
  
  RDC R-321X SoC
@@@ -13219,10 -13097,10 +13225,10 @@@ R:        Steven Rostedt <rostedt@goodmis.org
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  R:    Lai Jiangshan <jiangshanlai@gmail.com>
  R:    Joel Fernandes <joel@joelfernandes.org>
 -L:    linux-kernel@vger.kernel.org
 +L:    rcu@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/
  X:    Documentation/RCU/torture.txt
  F:    include/linux/rcu*
@@@ -13448,7 -13326,7 +13454,7 @@@ ROCKETPORT DRIVE
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
  S:    Maintained
 -F:    Documentation/serial/rocket.txt
 +F:    Documentation/serial/rocket.rst
  F:    drivers/tty/rocket*
  
  ROCKETPORT EXPRESS/INFINITY DRIVER
@@@ -13532,12 -13410,6 +13538,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtlwifi/
  
 +REALTEK WIRELESS DRIVER (rtw88)
 +M:    Yan-Hsuan Chuang <yhchuang@realtek.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/wireless/realtek/rtw88/
 +
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <Jes.Sorensen@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -14083,7 -13955,7 +14089,7 @@@ W:   https://selinuxproject.or
  W:    https://github.com/SELinuxProject
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
  S:    Supported
 -F:    include/linux/selinux*
 +F:    include/uapi/linux/selinux_netlink.h
  F:    security/selinux/
  F:    scripts/selinux/
  F:    Documentation/admin-guide/LSM/SELinux.rst
@@@ -14380,10 -14252,10 +14386,10 @@@ M:        "Paul E. McKenney" <paulmck@linux.ib
  M:    Josh Triplett <josh@joshtriplett.org>
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 -L:    linux-kernel@vger.kernel.org
 +L:    rcu@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    include/linux/srcu*.h
  F:    kernel/rcu/srcu*.c
  
@@@ -14424,21 -14296,21 +14430,21 @@@ SMM665 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/smm665
 +F:    Documentation/hwmon/smm665.rst
  F:    drivers/hwmon/smm665.c
  
  SMSC EMC2103 HARDWARE MONITOR DRIVER
  M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/emc2103
 +F:    Documentation/hwmon/emc2103.rst
  F:    drivers/hwmon/emc2103.c
  
  SMSC SCH5627 HARDWARE MONITOR DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
 -F:    Documentation/hwmon/sch5627
 +F:    Documentation/hwmon/sch5627.rst
  F:    drivers/hwmon/sch5627.c
  
  SMSC UFX6000 and UFX7000 USB to VGA DRIVER
@@@ -14451,7 -14323,7 +14457,7 @@@ SMSC47B397 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/smsc47b397
 +F:    Documentation/hwmon/smsc47b397.rst
  F:    drivers/hwmon/smsc47b397.c
  
  SMSC911x ETHERNET DRIVER
@@@ -14471,8 -14343,9 +14477,8 @@@ SOC-CAMERA V4L2 SUBSYSTE
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Orphan
 -F:    include/media/soc*
 -F:    drivers/media/i2c/soc_camera/
 -F:    drivers/media/platform/soc_camera/
 +F:    include/media/soc_camera.h
 +F:    drivers/staging/media/soc_camera/
  
  SOCIONEXT SYNQUACER I2C DRIVER
  M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
@@@ -14608,15 -14481,16 +14614,15 @@@ T:        git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/imx355.c
  
 -SONY MEMORYSTICK CARD SUPPORT
 -M:    Alex Dubov <oakad@yahoo.com>
 -W:    http://tifmxx.berlios.de/
 -S:    Maintained
 -F:    drivers/memstick/host/tifm_ms.c
 -
 -SONY MEMORYSTICK STANDARD SUPPORT
 +SONY MEMORYSTICK SUBSYSTEM
  M:    Maxim Levitsky <maximlevitsky@gmail.com>
 +M:    Alex Dubov <oakad@yahoo.com>
 +M:    Ulf Hansson <ulf.hansson@linaro.org>
 +L:    linux-mmc@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
  S:    Maintained
 -F:    drivers/memstick/core/ms_block.*
 +F:    drivers/memstick/
 +F:    include/linux/memstick.h
  
  SONY VAIO CONTROL DEVICE DRIVER
  M:    Mattia Dongili <malattia@linux.it>
@@@ -14634,6 -14508,7 +14640,6 @@@ M:   Takashi Iwai <tiwai@suse.com
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://www.alsa-project.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 -T:    git git://git.alsa-project.org/alsa-kernel.git
  Q:    http://patchwork.kernel.org/project/alsa-devel/list/
  S:    Maintained
  F:    Documentation/sound/
@@@ -14811,14 -14686,6 +14817,14 @@@ S: Maintaine
  F:    drivers/iio/imu/st_lsm6dsx/
  F:    Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
  
 +ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER
 +M:    Mickael Guene <mickael.guene@st.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/st-mipid02.c
 +F:    Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt
 +
  ST STM32 I2C/SMBUS DRIVER
  M:    Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
  L:    linux-i2c@vger.kernel.org
@@@ -15455,11 -15322,6 +15461,11 @@@ M: Laxman Dewangan <ldewangan@nvidia.co
  S:    Supported
  F:    drivers/spi/spi-tegra*
  
 +TEGRA XUSB PADCTL DRIVER
 +M:    JC Kuo <jckuo@nvidia.com>
 +S:    Supported
 +F:    drivers/phy/tegra/xusb*
 +
  TEHUTI ETHERNET DRIVER
  M:    Andy Gospodarek <andy@greyhouse.net>
  L:    netdev@vger.kernel.org
@@@ -15653,11 -15515,9 +15659,11 @@@ S: Maintaine
  F:    drivers/net/ethernet/ti/cpsw*
  F:    drivers/net/ethernet/ti/davinci*
  
 -TI FLASH MEDIA INTERFACE DRIVER
 +TI FLASH MEDIA MEMORYSTICK/MMC DRIVERS
  M:    Alex Dubov <oakad@yahoo.com>
  S:    Maintained
 +W:    http://tifmxx.berlios.de/
 +F:    drivers/memstick/host/tifm_ms.c
  F:    drivers/misc/tifm*
  F:    drivers/mmc/host/tifm_sd.c
  F:    include/linux/tifm.h
@@@ -15809,7 -15669,7 +15815,7 @@@ TMP401 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/tmp401
 +F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
  TMPFS (SHMEM FILESYSTEM)
@@@ -15842,7 -15702,7 +15848,7 @@@ M:   "Paul E. McKenney" <paulmck@linux.ib
  M:    Josh Triplett <josh@joshtriplett.org>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/torture.txt
  F:    kernel/torture.c
  F:    kernel/rcu/rcutorture.c
@@@ -16084,12 -15944,6 +16090,12 @@@ F: drivers/uwb
  F:    include/linux/uwb.h
  F:    include/linux/uwb/
  
 +UNICODE SUBSYSTEM:
 +M:    Gabriel Krisman Bertazi <krisman@collabora.com>
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Supported
 +F:    fs/unicode/
 +
  UNICORE32 ARCHITECTURE:
  M:    Guan Xuetao <gxt@pku.edu.cn>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
@@@ -16135,13 -15989,6 +16141,13 @@@ L: linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
  
 +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
 +M:    Stanley Chu <stanley.chu@mediatek.com>
 +L:    linux-scsi@vger.kernel.org
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/scsi/ufs/ufs-mediatek*
 +
  UNSORTED BLOCK IMAGES (UBI)
  M:    Artem Bityutskiy <dedekind1@gmail.com>
  M:    Richard Weinberger <richard@nod.at>
@@@ -16245,14 -16092,6 +16251,14 @@@ L: linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/roles/intel-xhci-usb-role-switch.c
  
 +USB IP DRIVER FOR HISILICON KIRIN
 +M:    Yu Chen <chenyu56@huawei.com>
 +M:    Binghui Wang <wangbinghui@hisilicon.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt
 +F:    drivers/phy/hisilicon/phy-hi3660-usb3.c
 +
  USB ISP116X DRIVER
  M:    Olav Kongas <ok@artecdesign.ee>
  L:    linux-usb@vger.kernel.org
@@@ -16279,7 -16118,7 +16285,7 @@@ F:   drivers/usb/storage
  USB MIDI DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -T:    git git://git.alsa-project.org/alsa-kernel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/usb/midi.*
  
@@@ -16868,7 -16707,7 +16874,7 @@@ VT1211 HARDWARE MONITOR DRIVE
  M:    Juerg Haefliger <juergh@gmail.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/vt1211
 +F:    Documentation/hwmon/vt1211.rst
  F:    drivers/hwmon/vt1211.c
  
  VT8231 HARDWARE MONITOR DRIVER
@@@ -16896,14 -16735,14 +16902,14 @@@ W83791D HARDWARE MONITORING DRIVE
  M:    Marc Hulsman <m.hulsman@tudelft.nl>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/w83791d
 +F:    Documentation/hwmon/w83791d.rst
  F:    drivers/hwmon/w83791d.c
  
  W83793 HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <r.marek@assembler.cz>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/w83793
 +F:    Documentation/hwmon/w83793.rst
  F:    drivers/hwmon/w83793.c
  
  W83795 HARDWARE MONITORING DRIVER
@@@ -17012,7 -16851,7 +17018,7 @@@ L:   patches@opensource.cirrus.co
  T:    git https://github.com/CirrusLogic/linux-drivers.git
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported
 -F:    Documentation/hwmon/wm83??
 +F:    Documentation/hwmon/wm83??.rst
  F:    Documentation/devicetree/bindings/extcon/extcon-arizona.txt
  F:    Documentation/devicetree/bindings/regulator/arizona-regulator.txt
  F:    Documentation/devicetree/bindings/mfd/arizona.txt
@@@ -17102,7 -16941,7 +17108,7 @@@ M:   Tony Luck <tony.luck@intel.com
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
 -F:    arch/x86/kernel/cpu/mcheck/*
 +F:    arch/x86/kernel/cpu/mce/*
  
  X86 MICROCODE UPDATE SUPPORT
  M:    Borislav Petkov <bp@alien8.de>
diff --combined include/linux/device.h
index 4457e560bc2b09cf3f10e943aa1fcfe40a0ebd49,ad626df2e12e2607f6c7a97b687191a73aa0f995..e85264fb66161408aee2815001d8d5159ab04ac1
--- 1/include/linux/device.h
--- 2/include/linux/device.h
+++ b/include/linux/device.h
@@@ -976,14 -976,18 +976,14 @@@ struct dev_links_info 
   * a higher-level representation of the device.
   */
  struct device {
 +      struct kobject kobj;
        struct device           *parent;
  
        struct device_private   *p;
  
 -      struct kobject kobj;
        const char              *init_name; /* initial name of the device */
        const struct device_type *type;
  
 -      struct mutex            mutex;  /* mutex to synchronize calls to
 -                                       * its driver.
 -                                       */
 -
        struct bus_type *bus;           /* type of bus device is on */
        struct device_driver *driver;   /* which driver has allocated this
                                           device */
@@@ -991,10 -995,6 +991,10 @@@
                                           core doesn't touch it */
        void            *driver_data;   /* Driver data, set and get with
                                           dev_set_drvdata/dev_get_drvdata */
 +      struct mutex            mutex;  /* mutex to synchronize calls to
 +                                       * its driver.
 +                                       */
 +
        struct dev_links_info   links;
        struct dev_pm_info      power;
        struct dev_pm_domain    *pm_domain;
@@@ -1009,6 -1009,9 +1009,6 @@@
        struct list_head        msi_list;
  #endif
  
 -#ifdef CONFIG_NUMA
 -      int             numa_node;      /* NUMA node this device is close to */
 -#endif
        const struct dma_map_ops *dma_ops;
        u64             *dma_mask;      /* dma mask (if dma'able device) */
        u64             coherent_dma_mask;/* Like dma_mask, but for
@@@ -1037,9 -1040,6 +1037,9 @@@
        struct device_node      *of_node; /* associated device tree node */
        struct fwnode_handle    *fwnode; /* firmware device node */
  
 +#ifdef CONFIG_NUMA
 +      int             numa_node;      /* NUMA node this device is close to */
 +#endif
        dev_t                   devt;   /* dev_t, creates the sysfs "dev" */
        u32                     id;     /* device instance */
  
@@@ -1229,7 -1229,7 +1229,7 @@@ static inline void device_lock_assert(s
  
  static inline struct device_node *dev_of_node(struct device *dev)
  {
-       if (!IS_ENABLED(CONFIG_OF))
+       if (!IS_ENABLED(CONFIG_OF) || !dev)
                return NULL;
        return dev->of_node;
  }
Unnamed repository; edit this file 'description' to name the repository.