Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

author Linus Torvalds <torvalds@linux-foundation.org>

Sat, 5 Jan 2019 19:30:37 +0000 (11:30 -0800)

committer Linus Torvalds <torvalds@linux-foundation.org>

Sat, 5 Jan 2019 19:30:37 +0000 (11:30 -0800)
author Linus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jan 2019 19:30:37 +0000 (11:30 -0800)
committer Linus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jan 2019 19:30:37 +0000 (11:30 -0800)
diff --combined Documentation/admin-guide/kernel-parameters.txt

index e7b5c49702bbf27994d6ed590a64a9d9af13415b,98ee9eaa52be146927178f4ee3fa59477f0db2fb..b799bcf67d7b5ae080694467442b113b49c92567
--- 1/Documentation/admin-guide/kernel-parameters.txt
--- 2/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -331,7 -331,7 +331,7 @@@
                         APC and your system crashes randomly.
   
         apic=           [APIC,X86] Advanced Programmable Interrupt Controller
- -                      Change the output verbosity whilst booting
+ +                      Change the output verbosity while booting
                         Format: { quiet (default) | verbose | debug }
                         Change the amount of debugging information output
                         when initialising the APIC and IO-APIC components.
@@@ -486,14 -486,10 +486,14 @@@
                         cut the overhead, others just disable the usage. So
                         only cgroup_disable=memory is actually worthy}
   
- -      cgroup_no_v1=   [KNL] Disable one, multiple, all cgroup controllers in v1
- -                      Format: { controller[,controller...] | "all" }
+ +      cgroup_no_v1=   [KNL] Disable cgroup controllers and named hierarchies in v1
+ +                      Format: { { controller | "all" | "named" }
+ +                                [,{ controller | "all" | "named" }...] }
                         Like cgroup_disable, but only applies to cgroup v1;
                         the blacklisted controllers remain available in cgroup2.
+ +                      "all" blacklists all controllers and "named" disables
+ +                      named mounts. Specifying both "all" and "named" disables
+ +                      all v1 hierarchies.
   
         cgroup.memory=  [KNL] Pass options to the cgroup memory controller.
                         Format: <string>
@@@ -678,9 -674,6 +678,9 @@@
         cpuidle.off=1   [CPU_IDLE]
                         disable the cpuidle sub-system
   
+ +      cpuidle.governor=
+ +                      [CPU_IDLE] Name of the cpuidle governor to use.
+ +
         cpufreq.off=1   [CPU_FREQ]
                         disable the cpufreq sub-system
   
@@@ -1026,6 -1019,12 +1026,12 @@@
                         Start an early, polled-mode console on a serial port
                         of an Actions Semi SoC, such as S500 or S900, at the
                         specified address. The serial port must already be
+                       setup and configured. Options are not yet supported.
+ 
+               rda,<addr>
+                       Start an early, polled-mode console on a serial port
+                       of an RDA Micro SoC, such as RDA8810PL, at the
+                       specified address. The serial port must already be
                         setup and configured. Options are not yet supported.
   
                 smh     Use ARM semihosting calls for early console.
@@@ -1690,12 -1689,12 +1696,12 @@@
                         By default, super page will be supported if Intel IOMMU
                         has the capability. With this option, super page will
                         not be supported.
- -              ecs_off [Default Off]
- -                      By default, extended context tables will be supported if
- -                      the hardware advertises that it has support both for the
- -                      extended tables themselves, and also PASID support. With
- -                      this option set, extended tables will not be used even
- -                      on hardware which claims to support them.
+ +              sm_off [Default Off]
+ +                      By default, scalable mode will be supported if the
+ +                      hardware advertises that it has support for the scalable
+ +                      mode translation. With this option set, scalable mode
+ +                      will not be used even on hardware which claims to support
+ +                      it.
                 tboot_noforce [Default Off]
                         Do not force the Intel IOMMU enabled under tboot.
                         By default, tboot will force Intel IOMMU on, which
@@@ -2103,9 -2102,6 +2109,9 @@@
                         off
                                 Disables hypervisor mitigations and doesn't
                                 emit any warnings.
+ +                              It also drops the swap size and available
+ +                              RAM limit restriction on both hypervisor and
+ +                              bare metal.
   
                         Default is 'flush'.
   
@@@ -2837,7 -2833,7 +2843,7 @@@
                         check bypass). With this option data leaks are possible
                         in the system.
   
- -      nospectre_v2    [X86] Disable all mitigations for the Spectre variant 2
+ +      nospectre_v2    [X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2
                         (indirect branch prediction) vulnerability. System may
                         allow data leaks with this option, which is equivalent
                         to spectre_v2=off.
@@@ -3092,14 -3088,6 +3098,14 @@@
                         timeout < 0: reboot immediately
                         Format: <timeout>
   
+ +      panic_print=    Bitmask for printing system info when panic happens.
+ +                      User can chose combination of the following bits:
+ +                      bit 0: print all tasks info
+ +                      bit 1: print system memory info
+ +                      bit 2: print timer info
+ +                      bit 3: print locks info if CONFIG_LOCKDEP is on
+ +                      bit 4: print ftrace buffer
+ +
         panic_on_warn   panic() instead of WARN().  Useful to cause kdump
                         on a WARN().
   
@@@ -3766,6 -3754,24 +3772,6 @@@
                         in microseconds.  The default of zero says
                         no holdoff.
   
- -      rcutorture.cbflood_inter_holdoff= [KNL]
- -                      Set holdoff time (jiffies) between successive
- -                      callback-flood tests.
- -
- -      rcutorture.cbflood_intra_holdoff= [KNL]
- -                      Set holdoff time (jiffies) between successive
- -                      bursts of callbacks within a given callback-flood
- -                      test.
- -
- -      rcutorture.cbflood_n_burst= [KNL]
- -                      Set the number of bursts making up a given
- -                      callback-flood test.  Set this to zero to
- -                      disable callback-flood testing.
- -
- -      rcutorture.cbflood_n_per_burst= [KNL]
- -                      Set the number of callbacks to be registered
- -                      in a given burst of a callback-flood test.
- -
         rcutorture.fqs_duration= [KNL]
                         Set duration of force_quiescent_state bursts
                         in microseconds.
@@@ -3778,23 -3784,6 +3784,23 @@@
                         Set wait time between force_quiescent_state bursts
                         in seconds.
   
+ +      rcutorture.fwd_progress= [KNL]
+ +                      Enable RCU grace-period forward-progress testing
+ +                      for the types of RCU supporting this notion.
+ +
+ +      rcutorture.fwd_progress_div= [KNL]
+ +                      Specify the fraction of a CPU-stall-warning
+ +                      period to do tight-loop forward-progress testing.
+ +
+ +      rcutorture.fwd_progress_holdoff= [KNL]
+ +                      Number of seconds to wait between successive
+ +                      forward-progress tests.
+ +
+ +      rcutorture.fwd_progress_need_resched= [KNL]
+ +                      Enclose cond_resched() calls within checks for
+ +                      need_resched() during tight-loop forward-progress
+ +                      testing.
+ +
         rcutorture.gp_cond= [KNL]
                         Use conditional/asynchronous update-side
                         primitives, if available.
diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt

index 3bbe3b87a1ff9f34239a500e61503cfeb6244596,37826fac76840827698f576f45def6f3455bf34b..389508584f48d36414894f9da0f8e1044ef25593
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -67,7 -67,6 +67,7 @@@ capella       Capella Microsystems, In
   cascoda       Cascoda, Ltd.
   cavium        Cavium, Inc.
   cdns  Cadence Design Systems Inc.
+ +cdtech        CDTech(H.K.) Electronics Limited
   ceva  Ceva, Inc.
   chipidea      Chipidea, Inc
   chipone               ChipOne
@@@ -114,7 -113,6 +114,7 @@@ edt        Emerging Display Technologie
   eeti  eGalax_eMPIA Technology Inc
   elan  Elan Microelectronic Corp.
   embest        Shenzhen Embest Technology Co., Ltd.
+ +emlid Emlid, Ltd.
   emmicro       EM Microelectronic
   emtrion       emtrion GmbH
   endless       Endless Mobile, Inc.
@@@ -172,7 -170,6 +172,7 @@@ holtek     Holtek Semiconductor, Inc
   hwacom        HwaCom Systems Inc.
   i2se  I2SE GmbH
   ibm   International Business Machines (IBM)
+ +icplus        IC Plus Corp.
   idt   Integrated Device Technologies, Inc.
   ifi   Ingenieurburo Fur Ic-Technologie (I/F/I)
   ilitek        ILI Technology Corporation (ILITEK)
@@@ -299,7 -296,6 +299,7 @@@ panasonic  Panasonic Corporatio
   parade        Parade Technologies Inc.
   pericom       Pericom Technology Inc.
   pervasive     Pervasive Displays, Inc.
+ +phicomm PHICOMM Co., Ltd.
   phytec        PHYTEC Messtechnik GmbH
   picochip      Picochip Ltd
   pine64        Pine64
@@@ -307,7 -303,6 +307,7 @@@ pixcir  PIXCIR MICROELECTRONICS Co., Lt
   plathome      Plat'Home Co., Ltd.
   plda  PLDA
   plx   Broadcom Corporation (formerly PLX Technology)
+ +pni   PNI Sensor Corporation
   portwell      Portwell Inc.
   poslab        Poslab Technology Co., Ltd.
   powervr       PowerVR (deprecated, use img)
@@@ -325,6 -320,7 +325,7 @@@ ralink     Mediatek/Ralink Technology Corp
   ramtron       Ramtron International
   raspberrypi   Raspberry Pi Foundation
   raydium       Raydium Semiconductor Corp.
+ rda   Unisoc Communications, Inc.
   realtek Realtek Semiconductor Corp.
   renesas       Renesas Electronics Corporation
   richtek       Richtek Technology Corporation
@@@ -420,7 -416,6 +421,7 @@@ vamrs      Vamrs Ltd
   variscite     Variscite Ltd.
   via   VIA Technologies, Inc.
   virtio        Virtual I/O Device Specification, developed by the OASIS consortium
+ +vishay        Vishay Intertechnology, Inc
   vitesse       Vitesse Semiconductor Corporation
   vivante       Vivante Corporation
   vocore VoCore Studio
diff --combined MAINTAINERS

index 99113b9fcdd289ca594c5960c616851755c7c3ed,77e0e64abaefc828fab0bd7f8523db3879fa4dda..58551782e960698d38c529afa7a3fdb54bb43829
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -140,7 -140,7 +140,7 @@@ Maintainers List (try to look for most 
   M:    Steffen Klassert <klassert@kernel.org>
   L:    netdev@vger.kernel.org
   S:    Odd Fixes
- -F:    Documentation/networking/vortex.txt
+ +F:    Documentation/networking/device_drivers/3com/vortex.txt
   F:    drivers/net/ethernet/3com/3c59x.c
   
   3CR990 NETWORK DRIVER
@@@ -740,7 -740,7 +740,7 @@@ R: Saeed Bishara <saeedb@amazon.com
   R:    Zorik Machulsky <zorik@amazon.com>
   L:    netdev@vger.kernel.org
   S:    Supported
- -F:    Documentation/networking/ena.txt
+ +F:    Documentation/networking/device_drivers/amazon/ena.txt
   F:    drivers/net/ethernet/amazon/
   
   AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
@@@ -846,14 -846,6 +846,14 @@@ S:       Supporte
   F:    drivers/iio/dac/ad5758.c
   F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
   
+ +ANALOG DEVICES INC AD7124 DRIVER
+ +M:    Stefan Popa <stefan.popa@analog.com>
+ +L:    linux-iio@vger.kernel.org
+ +W:    http://ez.analog.com/community/linux-device-drivers
+ +S:    Supported
+ +F:    drivers/iio/adc/ad7124.c
+ +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
+ +
   ANALOG DEVICES INC AD9389B DRIVER
   M:    Hans Verkuil <hans.verkuil@cisco.com>
   L:    linux-media@vger.kernel.org
@@@ -958,7 -950,6 +958,7 @@@ M: Arve Hjønnevåg <arve@android.com
   M:    Todd Kjos <tkjos@android.com>
   M:    Martijn Coenen <maco@android.com>
   M:    Joel Fernandes <joel@joelfernandes.org>
+ +M:    Christian Brauner <christian@brauner.io>
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
   L:    devel@driverdev.osuosl.org
   S:    Supported
@@@ -1306,6 -1297,7 +1306,6 @@@ F:      include/dt-bindings/clock/gxbb
   F:    Documentation/devicetree/bindings/clock/amlogic*
   
   ARM/Amlogic Meson SoC support
- -M:    Carlo Caione <carlo@caione.org>
   M:    Kevin Hilman <khilman@baylibre.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   L:    linux-amlogic@lists.infradead.org
@@@ -1316,16 -1308,8 +1316,16 @@@ F:    arch/arm/boot/dts/meson
   F:    arch/arm64/boot/dts/amlogic/
   F:    drivers/pinctrl/meson/
   F:    drivers/mmc/host/meson*
+ +F:    drivers/soc/amlogic/
   N:    meson
   
+ +ARM/Amlogic Meson SoC Sound Drivers
+ +M:    Jerome Brunet <jbrunet@baylibre.com>
+ +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    sound/soc/meson/
+ +F:    Documentation/devicetree/bindings/sound/amlogic*
+ +
   ARM/Annapurna Labs ALPINE ARCHITECTURE
   M:    Tsahee Zidenberg <tsahee@annapurnalabs.com>
   M:    Antoine Tenart <antoine.tenart@bootlin.com>
@@@ -1443,7 -1427,6 +1443,7 @@@ F:      arch/arm/mach-ep93xx/micro9.
   
   ARM/CORESIGHT FRAMEWORK AND DRIVERS
   M:    Mathieu Poirier <mathieu.poirier@linaro.org>
+ +R:    Suzuki K Poulose <suzuki.poulose@arm.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   F:    drivers/hwtracing/coresight/*
@@@ -1540,6 -1523,7 +1540,7 @@@ F:      arch/arm/mach-imx
   F:    arch/arm/mach-mxs/
   F:    arch/arm/boot/dts/imx*
   F:    arch/arm/configs/imx*_defconfig
+ F:    arch/arm64/boot/dts/freescale/imx*
   F:    drivers/clk/imx/
   F:    drivers/firmware/imx/
   F:    drivers/soc/imx/
@@@ -1967,6 -1951,20 +1968,20 @@@ M:    Lennert Buytenhek <kernel@wantstofly
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   
+ ARM/RDA MICRO ARCHITECTURE
+ M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ L:    linux-unisoc@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/boot/dts/rda8810pl-*
+ F:    drivers/clocksource/timer-rda.c
+ F:    drivers/irqchip/irq-rda-intc.c
+ F:    drivers/tty/serial/rda-uart.c
+ F:    Documentation/devicetree/bindings/arm/rda.txt
+ F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
+ F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
+ F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
+ 
   ARM/REALTEK ARCHITECTURE
   M:    Andreas Färber <afaerber@suse.de>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2084,6 -2082,7 +2099,6 @@@ M:      Andrzej Hajda <a.hajda@samsung.com
   L:    linux-arm-kernel@lists.infradead.org
   L:    linux-media@vger.kernel.org
   S:    Maintained
- -F:    arch/arm/plat-samsung/s5p-dev-mfc.c
   F:    drivers/media/platform/s5p-mfc/
   
   ARM/SHMOBILE ARM ARCHITECTURE
@@@ -2225,7 -2224,6 +2240,7 @@@ S:      Supporte
   F:    Documentation/devicetree/bindings/arm/ti/k3.txt
   F:    arch/arm64/boot/dts/ti/Makefile
   F:    arch/arm64/boot/dts/ti/k3-*
+ +F:    include/dt-bindings/pinctrl/k3.h
   
   ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
   M:    Santosh Shilimkar <ssantosh@kernel.org>
@@@ -2269,7 -2267,6 +2284,7 @@@ M:      Masahiro Yamada <yamada.masahiro@soc
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/arm/socionext/uniphier.txt
   F:    Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
   F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
   F:    arch/arm/boot/dts/uniphier*
@@@ -2279,7 -2276,6 +2294,7 @@@ F:      arch/arm/mm/cache-uniphier.
   F:    arch/arm64/boot/dts/socionext/uniphier*
   F:    drivers/bus/uniphier-system-bus.c
   F:    drivers/clk/uniphier/
+ +F:    drivers/dmaengine/uniphier-mdmac.c
   F:    drivers/gpio/gpio-uniphier.c
   F:    drivers/i2c/busses/i2c-uniphier*
   F:    drivers/irqchip/irq-uniphier-aidet.c
@@@ -2366,7 -2362,7 +2381,7 @@@ F:      drivers/pinctrl/zte
   F:    drivers/soc/zte/
   F:    drivers/thermal/zx2967_thermal.c
   F:    drivers/watchdog/zx2967_wdt.c
- -F:    Documentation/devicetree/bindings/arm/zte.txt
+ +F:    Documentation/devicetree/bindings/arm/zte.yaml
   F:    Documentation/devicetree/bindings/clock/zx2967*.txt
   F:    Documentation/devicetree/bindings/dma/zxdma.txt
   F:    Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
@@@ -2438,14 -2434,6 +2453,14 @@@ S:    Maintaine
   F:    Documentation/hwmon/asc7621
   F:    drivers/hwmon/asc7621.c
   
+ +ASPEED VIDEO ENGINE DRIVER
+ +M:    Eddie James <eajames@linux.ibm.com>
+ +L:    linux-media@vger.kernel.org
+ +L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    drivers/media/platform/aspeed-video.c
+ +F:    Documentation/devicetree/bindings/media/aspeed-video.txt
+ +
   ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
   M:    Corentin Chary <corentin.chary@gmail.com>
   L:    acpi4asus-user@lists.sourceforge.net
@@@ -3497,7 -3485,6 +3512,7 @@@ F:      include/linux/spi/cc2520.
   F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
   
   CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
+ +M:    Yael Chemla <yael.chemla@foss.arm.com>
   M:    Gilad Ben-Yossef <gilad@benyossef.com>
   L:    linux-crypto@vger.kernel.org
   S:    Supported
@@@ -3701,8 -3688,6 +3716,8 @@@ F:      drivers/net/ethernet/cisco/enic
   
   CISCO VIC LOW LATENCY NIC DRIVER
   M:    Christian Benvenuti <benve@cisco.com>
+ +M:    Nelson Escobar <neescoba@cisco.com>
+ +M:    Parvi Kaustubhi <pkaustub@cisco.com>
   S:    Supported
   F:    drivers/infiniband/hw/usnic/
   
@@@ -3716,10 -3701,8 +3731,10 @@@ W:    https://github.com/CirrusLogic/linux
   S:    Supported
   F:    Documentation/devicetree/bindings/mfd/madera.txt
   F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
+ +F:    include/linux/irqchip/irq-madera*
   F:    include/linux/mfd/madera/*
   F:    drivers/gpio/gpio-madera*
+ +F:    drivers/irqchip/irq-madera*
   F:    drivers/mfd/madera*
   F:    drivers/mfd/cs47l*
   F:    drivers/pinctrl/cirrus/*
@@@ -4027,20 -4010,13 +4042,20 @@@ T:   git git://linuxtv.org/media_tree.gi
   W:    http://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/i2c/cs3308.c
- -F:    drivers/media/i2c/cs3308.h
   
   CS5535 Audio ALSA driver
   M:    Jaya Kumar <jayakumar.alsa@gmail.com>
   S:    Maintained
   F:    sound/pci/cs5535audio/
   
+ +CSI DRIVERS FOR ALLWINNER V3s
+ +M:    Yong Deng <yong.deng@magewell.com>
+ +L:    linux-media@vger.kernel.org
+ +T:    git git://linuxtv.org/media_tree.git
+ +S:    Maintained
+ +F:    drivers/media/platform/sunxi/sun6i-csi/
+ +F:    Documentation/devicetree/bindings/media/sun6i-csi.txt
+ +
   CW1200 WLAN driver
   M:    Solomon Peachy <pizza@shaftnet.org>
   S:    Maintained
@@@ -4065,7 -4041,7 +4080,7 @@@ T:      git git://linuxtv.org/media_tree.gi
   W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/common/cx2341x*
- -F:    include/media/cx2341x*
+ +F:    include/media/drv-intf/cx2341x.h
   
   CX24120 MEDIA DRIVER
   M:    Jemma Denson <jdenson@gmail.com>
@@@ -4154,7 -4130,7 +4169,7 @@@ S:      Supporte
   F:    drivers/net/ethernet/chelsio/cxgb4vf/
   
   CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
- -M:    Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+ +M:    Frederic Barrat <fbarrat@linux.ibm.com>
   M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
   L:    linuxppc-dev@lists.ozlabs.org
   S:    Supported
@@@ -4166,9 -4142,9 +4181,9 @@@ F:      Documentation/powerpc/cxl.tx
   F:    Documentation/ABI/testing/sysfs-class-cxl
   
   CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
- -M:    Manoj N. Kumar <manoj@linux.vnet.ibm.com>
- -M:    Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
- -M:    Uma Krishnan <ukrishn@linux.vnet.ibm.com>
+ +M:    Manoj N. Kumar <manoj@linux.ibm.com>
+ +M:    Matthew R. Ochs <mrochs@linux.ibm.com>
+ +M:    Uma Krishnan <ukrishn@linux.ibm.com>
   L:    linux-scsi@vger.kernel.org
   S:    Supported
   F:    drivers/scsi/cxlflash/
@@@ -4240,7 -4216,7 +4255,7 @@@ F:      net/ax25/sysctl_net_ax25.
   DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
   L:    netdev@vger.kernel.org
   S:    Orphan
- -F:    Documentation/networking/dmfe.txt
+ +F:    Documentation/networking/device_drivers/dec/dmfe.txt
   F:    drivers/net/ethernet/dec/tulip/dmfe.c
   
   DC390/AM53C974 SCSI driver
@@@ -4776,13 -4752,6 +4791,13 @@@ S:    Maintaine
   F:    drivers/gpu/drm/tinydrm/ili9225.c
   F:    Documentation/devicetree/bindings/display/ilitek,ili9225.txt
   
+ +DRM DRIVER FOR HX8357D PANELS
+ +M:    Eric Anholt <eric@anholt.net>
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
+ +S:    Maintained
+ +F:    drivers/gpu/drm/tinydrm/hx8357d.c
+ +F:    Documentation/devicetree/bindings/display/himax,hx8357d.txt
+ +
   DRM DRIVER FOR INTEL I810 VIDEO CARDS
   S:    Orphan / Obsolete
   F:    drivers/gpu/drm/i810/
@@@ -4824,12 -4793,6 +4839,12 @@@ S:    Supporte
   F:    drivers/gpu/drm/nouveau/
   F:    include/uapi/drm/nouveau_drm.h
   
+ +DRM DRIVER FOR OLIMEX LCD-OLINUXINO PANELS
+ +M:    Stefan Mavrodiev <stefan@olimex.com>
+ +S:    Maintained
+ +F:    drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
+ +F:    Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt
+ +
   DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
   M:    Noralf Trønnes <noralf@tronnes.org>
   S:    Maintained
@@@ -4895,8 -4858,10 +4910,8 @@@ T:     git git://anongit.freedesktop.org/dr
   
   DRM DRIVER FOR VMWARE VIRTUAL GPU
   M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
- -M:    Sinclair Yeh <syeh@vmware.com>
   M:    Thomas Hellstrom <thellstrom@vmware.com>
   L:    dri-devel@lists.freedesktop.org
- -T:    git git://people.freedesktop.org/~syeh/repos_linux
   T:    git git://people.freedesktop.org/~thomash/linux
   S:    Supported
   F:    drivers/gpu/drm/vmwgfx/
@@@ -4954,7 -4919,7 +4969,7 @@@ F:      Documentation/gpu/meson.rs
   T:    git git://anongit.freedesktop.org/drm/drm-misc
   
   DRM DRIVERS FOR ATMEL HLCDC
- -M:    Boris Brezillon <boris.brezillon@bootlin.com>
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
   L:    dri-devel@lists.freedesktop.org
   S:    Supported
   F:    drivers/gpu/drm/atmel-hlcdc/
@@@ -5463,6 -5428,7 +5478,6 @@@ S:      Maintaine
   F:    drivers/edac/i82443bxgx_edac.c
   
   EDAC-I82975X
- -M:    Ranganathan Desikan <ravi@jetztechnologies.com>
   M:    "Arvind R." <arvino55@gmail.com>
   L:    linux-edac@vger.kernel.org
   S:    Maintained
@@@ -5560,7 -5526,7 +5575,7 @@@ S:      Orpha
   F:    fs/efs/
   
   EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
- -M:    Douglas Miller <dougmill@linux.vnet.ibm.com>
+ +M:    Douglas Miller <dougmill@linux.ibm.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    drivers/net/ethernet/ibm/ehea/
@@@ -5674,7 -5640,6 +5689,7 @@@ F:      include/linux/of_net.
   F:    include/linux/phy.h
   F:    include/linux/phy_fixed.h
   F:    include/linux/platform_data/mdio-bcm-unimac.h
+ +F:    include/linux/platform_data/mdio-gpio.h
   F:    include/trace/events/mdio.h
   F:    include/uapi/linux/mdio.h
   F:    include/uapi/linux/mii.h
@@@ -5699,7 -5664,7 +5714,7 @@@ F:      Documentation/filesystems/ext4/ext4.
   F:    fs/ext4/
   
   Extended Verification Module (EVM)
- -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
+ +M:    Mimi Zohar <zohar@linux.ibm.com>
   L:    linux-integrity@vger.kernel.org
   S:    Supported
   F:    security/integrity/evm/
@@@ -5909,7 -5874,7 +5924,7 @@@ F:      include/linux/firmware.
   
   FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
   M:    Joshua Morris <josh.h.morris@us.ibm.com>
- -M:    Philip Kelleher <pjk1939@linux.vnet.ibm.com>
+ +M:    Philip Kelleher <pjk1939@linux.ibm.com>
   S:    Maintained
   F:    drivers/block/rsxx/
   
@@@ -6176,7 -6141,7 +6191,7 @@@ F:      include/linux/fscrypt*.
   F:    Documentation/filesystems/fscrypt.rst
   
   FSI-ATTACHED I2C DRIVER
- -M:    Eddie James <eajames@linux.vnet.ibm.com>
+ +M:    Eddie James <eajames@linux.ibm.com>
   L:    linux-i2c@vger.kernel.org
   L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
   S:    Maintained
@@@ -6323,7 -6288,6 +6338,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
   S:    Supported
   F:    drivers/phy/
   F:    include/linux/phy/
+ +F:    Documentation/devicetree/bindings/phy/
   
   GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
   M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
@@@ -6353,7 -6317,8 +6368,7 @@@ S:      Supporte
   F:    drivers/uio/uio_pci_generic.c
   
   GENWQE (IBM Generic Workqueue Card)
- -M:    Frank Haverkamp <haver@linux.vnet.ibm.com>
- -M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
+ +M:    Frank Haverkamp <haver@linux.ibm.com>
   S:    Supported
   F:    drivers/misc/genwqe/
   
@@@ -6426,6 -6391,7 +6441,6 @@@ F:      drivers/media/rc/gpio-ir-tx.
   
   GPIO MOCKUP DRIVER
   M:    Bamvor Jian Zhang <bamv2005@gmail.com>
- -R:    Bartosz Golaszewski <brgl@bgdev.pl>
   L:    linux-gpio@vger.kernel.org
   S:    Maintained
   F:    drivers/gpio/gpio-mockup.c
@@@ -6919,14 -6885,6 +6934,14 @@@ L:    linux-input@vger.kernel.or
   S:    Maintained
   F:    drivers/input/touchscreen/htcpen.c
   
+ +HTS221 TEMPERATURE-HUMIDITY IIO DRIVER
+ +M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+ +L:    linux-iio@vger.kernel.org
+ +W:    http://www.st.com/
+ +S:    Maintained
+ +F:    drivers/iio/humidity/hts221*
+ +F:    Documentation/devicetree/bindings/iio/humidity/hts221.txt
+ +
   HUAWEI ETHERNET DRIVER
   M:    Aviad Krawczyk <aviad.krawczyk@huawei.com>
   L:    netdev@vger.kernel.org
@@@ -6974,7 -6932,7 +6989,7 @@@ M:      Sasha Levin <sashal@kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
   L:    devel@linuxdriverproject.org
   S:    Supported
- -F:    Documentation/networking/netvsc.txt
+ +F:    Documentation/networking/device_drivers/microsoft/netvsc.txt
   F:    arch/x86/include/asm/mshyperv.h
   F:    arch/x86/include/asm/trace/hyperv.h
   F:    arch/x86/include/asm/hyperv-tlfs.h
@@@ -7134,24 -7092,6 +7149,24 @@@ L:    linux-i2c@vger.kernel.or
   S:    Maintained
   F:    drivers/i2c/i2c-stub.c
   
+ +I3C SUBSYSTEM
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
+ +L:    linux-i3c@lists.infradead.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
+ +S:    Maintained
+ +F:    Documentation/ABI/testing/sysfs-bus-i3c
+ +F:    Documentation/devicetree/bindings/i3c/
+ +F:    Documentation/driver-api/i3c
+ +F:    drivers/i3c/
+ +F:    include/linux/i3c/
+ +F:    include/dt-bindings/i3c/
+ +
+ +I3C DRIVER FOR SYNOPSYS DESIGNWARE
+ +M:    Vitor Soares <vitor.soares@synopsys.com>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
+ +F:    drivers/i3c/master/dw*
+ +
   IA64 (Itanium) PLATFORM
   M:    Tony Luck <tony.luck@intel.com>
   M:    Fenghua Yu <fenghua.yu@intel.com>
@@@ -7171,9 -7111,8 +7186,9 @@@ F:      crypto/842.
   F:    lib/842/
   
   IBM Power in-Nest Crypto Acceleration
- -M:    Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
- -M:    Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
+ +M:    Breno Leitão <leitao@debian.org>
+ +M:    Nayna Jain <nayna@linux.ibm.com>
+ +M:    Paulo Flabiano Smorigo <pfsmorigo@gmail.com>
   L:    linux-crypto@vger.kernel.org
   S:    Supported
   F:    drivers/crypto/nx/Makefile
@@@ -7190,8 -7129,8 +7205,8 @@@ S:      Supporte
   F:    drivers/scsi/ipr.*
   
   IBM Power SRIOV Virtual NIC Device Driver
- -M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
- -M:    John Allen <jallen@linux.vnet.ibm.com>
+ +M:    Thomas Falcon <tlfalcon@linux.ibm.com>
+ +M:    John Allen <jallen@linux.ibm.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    drivers/net/ethernet/ibm/ibmvnic.*
@@@ -7206,40 -7145,41 +7221,40 @@@ F:   arch/powerpc/include/asm/vas.
   F:    arch/powerpc/include/uapi/asm/vas.h
   
   IBM Power Virtual Ethernet Device Driver
- -M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
+ +M:    Thomas Falcon <tlfalcon@linux.ibm.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    drivers/net/ethernet/ibm/ibmveth.*
   
   IBM Power Virtual FC Device Drivers
- -M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+ +M:    Tyrel Datwyler <tyreld@linux.ibm.com>
   L:    linux-scsi@vger.kernel.org
   S:    Supported
   F:    drivers/scsi/ibmvscsi/ibmvfc*
   
   IBM Power Virtual Management Channel Driver
- -M:    Bryant G. Ly <bryantly@linux.vnet.ibm.com>
- -M:    Steven Royer <seroyer@linux.vnet.ibm.com>
+ +M:    Steven Royer <seroyer@linux.ibm.com>
   S:    Supported
   F:    drivers/misc/ibmvmc.*
   
   IBM Power Virtual SCSI Device Drivers
- -M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+ +M:    Tyrel Datwyler <tyreld@linux.ibm.com>
   L:    linux-scsi@vger.kernel.org
   S:    Supported
   F:    drivers/scsi/ibmvscsi/ibmvscsi*
   F:    include/scsi/viosrp.h
   
   IBM Power Virtual SCSI Device Target Driver
- -M:    Bryant G. Ly <bryantly@linux.vnet.ibm.com>
- -M:    Michael Cyr <mikecyr@linux.vnet.ibm.com>
+ +M:    Michael Cyr <mikecyr@linux.ibm.com>
   L:    linux-scsi@vger.kernel.org
   L:    target-devel@vger.kernel.org
   S:    Supported
   F:    drivers/scsi/ibmvscsi_tgt/
   
   IBM Power VMX Cryptographic instructions
- -M:    Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
- -M:    Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
+ +M:    Breno Leitão <leitao@debian.org>
+ +M:    Nayna Jain <nayna@linux.ibm.com>
+ +M:    Paulo Flabiano Smorigo <pfsmorigo@gmail.com>
   L:    linux-crypto@vger.kernel.org
   S:    Supported
   F:    drivers/crypto/vmx/Makefile
@@@ -7516,7 -7456,7 +7531,7 @@@ S:      Maintaine
   L:    linux-crypto@vger.kernel.org
   
   INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
- -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
+ +M:    Mimi Zohar <zohar@linux.ibm.com>
   M:    Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
   L:    linux-integrity@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
@@@ -7576,18 -7516,18 +7591,18 @@@ Q:   http://patchwork.ozlabs.org/project/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
   S:    Supported
- -F:    Documentation/networking/e100.rst
- -F:    Documentation/networking/e1000.rst
- -F:    Documentation/networking/e1000e.rst
- -F:    Documentation/networking/fm10k.rst
- -F:    Documentation/networking/igb.rst
- -F:    Documentation/networking/igbvf.rst
- -F:    Documentation/networking/ixgb.rst
- -F:    Documentation/networking/ixgbe.rst
- -F:    Documentation/networking/ixgbevf.rst
- -F:    Documentation/networking/i40e.rst
- -F:    Documentation/networking/iavf.rst
- -F:    Documentation/networking/ice.rst
+ +F:    Documentation/networking/device_drivers/intel/e100.rst
+ +F:    Documentation/networking/device_drivers/intel/e1000.rst
+ +F:    Documentation/networking/device_drivers/intel/e1000e.rst
+ +F:    Documentation/networking/device_drivers/intel/fm10k.rst
+ +F:    Documentation/networking/device_drivers/intel/igb.rst
+ +F:    Documentation/networking/device_drivers/intel/igbvf.rst
+ +F:    Documentation/networking/device_drivers/intel/ixgb.rst
+ +F:    Documentation/networking/device_drivers/intel/ixgbe.rst
+ +F:    Documentation/networking/device_drivers/intel/ixgbevf.rst
+ +F:    Documentation/networking/device_drivers/intel/i40e.rst
+ +F:    Documentation/networking/device_drivers/intel/iavf.rst
+ +F:    Documentation/networking/device_drivers/intel/ice.rst
   F:    drivers/net/ethernet/intel/
   F:    drivers/net/ethernet/intel/*/
   F:    include/linux/avf/virtchnl.h
@@@ -7677,14 -7617,6 +7692,14 @@@ S:    Maintaine
   F:    drivers/media/pci/intel/ipu3/
   F:    Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
   
+ +INTEL IPU3 CSI-2 IMGU DRIVER
+ +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
+ +L:    linux-media@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/staging/media/ipu3/
+ +F:    Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
+ +F:    Documentation/media/v4l-drivers/ipu3.rst
+ +
   INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
   M:    Krzysztof Halasa <khalasa@piap.pl>
   S:    Maintained
@@@ -7769,8 -7701,8 +7784,8 @@@ INTEL PRO/WIRELESS 2100, 2200BG, 2915AB
   M:    Stanislav Yakovlev <stas.yakovlev@gmail.com>
   L:    linux-wireless@vger.kernel.org
   S:    Maintained
- -F:    Documentation/networking/README.ipw2100
- -F:    Documentation/networking/README.ipw2200
+ +F:    Documentation/networking/device_drivers/intel/ipw2100.txt
+ +F:    Documentation/networking/device_drivers/intel/ipw2200.txt
   F:    drivers/net/wireless/intel/ipw2x00/
   
   INTEL PSTATE DRIVER
@@@ -8030,6 -7962,13 +8045,6 @@@ F:     include/linux/isdn
   F:    include/uapi/linux/isdn.h
   F:    include/uapi/linux/isdn/
   
- -ISDN SUBSYSTEM (Eicon active card driver)
- -M:    Armin Schindler <mac@melware.de>
- -L:    isdn4linux@listserv.isdn4linux.de (subscribers-only)
- -W:    http://www.melware.de
- -S:    Maintained
- -F:    drivers/isdn/hardware/eicon/
- -
   IT87 HARDWARE MONITORING DRIVER
   M:    Jean Delvare <jdelvare@suse.com>
   L:    linux-hwmon@vger.kernel.org
@@@ -8118,8 -8057,9 +8133,8 @@@ S:      Maintaine
   F:    drivers/media/platform/rcar_jpu.c
   
   JSM Neo PCI based serial card
- -M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
   L:    linux-serial@vger.kernel.org
- -S:    Maintained
+ +S:    Orphan
   F:    drivers/tty/serial/jsm/
   
   K10TEMP HARDWARE MONITORING DRIVER
@@@ -8325,7 -8265,6 +8340,7 @@@ W:      http://www.linux-kvm.or
   T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
   S:    Supported
   F:    arch/x86/kvm/
+ +F:    arch/x86/kvm/*/
   F:    arch/x86/include/uapi/asm/kvm*
   F:    arch/x86/include/asm/kvm*
   F:    arch/x86/include/asm/pvclock-abi.h
@@@ -8350,7 -8289,7 +8365,7 @@@ F:      include/uapi/linux/kexec.
   F:    kernel/kexec*
   
   KEYS-ENCRYPTED
- -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
+ +M:    Mimi Zohar <zohar@linux.ibm.com>
   L:    linux-integrity@vger.kernel.org
   L:    keyrings@vger.kernel.org
   S:    Supported
@@@ -8359,9 -8298,9 +8374,9 @@@ F:      include/keys/encrypted-type.
   F:    security/keys/encrypted-keys/
   
   KEYS-TRUSTED
- -M:    James Bottomley <jejb@linux.vnet.ibm.com>
+ +M:    James Bottomley <jejb@linux.ibm.com>
   M:      Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
- -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
+ +M:    Mimi Zohar <zohar@linuxibm.com>
   L:    linux-integrity@vger.kernel.org
   L:    keyrings@vger.kernel.org
   S:    Supported
@@@ -8414,7 -8353,7 +8429,7 @@@ F:      lib/test_kmod.
   F:    tools/testing/selftests/kmod/
   
   KPROBES
- -M:    Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
+ +M:    Naveen N. Rao <naveen.n.rao@linux.ibm.com>
   M:    Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
   M:    "David S. Miller" <davem@davemloft.net>
   M:    Masami Hiramatsu <mhiramat@kernel.org>
@@@ -8770,7 -8709,7 +8785,7 @@@ M:      Nicholas Piggin <npiggin@gmail.com
   M:    David Howells <dhowells@redhat.com>
   M:    Jade Alglave <j.alglave@ucl.ac.uk>
   M:    Luc Maranget <luc.maranget@inria.fr>
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   R:    Akira Yokosawa <akiyks@gmail.com>
   R:    Daniel Lustig <dlustig@nvidia.com>
   L:    linux-kernel@vger.kernel.org
@@@ -9045,7 -8984,7 +9060,7 @@@ F:      include/uapi/drm/armada_drm.
   F:    Documentation/devicetree/bindings/display/armada/
   
   MARVELL CRYPTO DRIVER
- -M:    Boris Brezillon <boris.brezillon@bootlin.com>
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
   M:    Arnaud Ebalard <arno@natisbad.org>
   F:    drivers/crypto/marvell/
   S:    Maintained
@@@ -9735,7 -9674,7 +9750,7 @@@ F:      drivers/platform/x86/mlx-platform.
   
   MEMBARRIER SUPPORT
   M:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
   F:    kernel/sched/membarrier.c
@@@ -9756,7 -9695,7 +9771,7 @@@ F:      mm
   MEMORY TECHNOLOGY DEVICES (MTD)
   M:    David Woodhouse <dwmw2@infradead.org>
   M:    Brian Norris <computersforpeace@gmail.com>
- -M:    Boris Brezillon <boris.brezillon@bootlin.com>
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
   M:    Marek Vasut <marek.vasut@gmail.com>
   M:    Richard Weinberger <richard@nod.at>
   L:    linux-mtd@lists.infradead.org
@@@ -9857,14 -9796,14 +9872,14 @@@ L:   linux-media@vger.kernel.or
   S:    Supported
   F:    drivers/media/platform/atmel/atmel-isc.c
   F:    drivers/media/platform/atmel/atmel-isc-regs.h
- -F:    devicetree/bindings/media/atmel-isc.txt
+ +F:    Documentation/devicetree/bindings/media/atmel-isc.txt
   
   MICROCHIP ISI DRIVER
   M:    Eugen Hristev <eugen.hristev@microchip.com>
   L:    linux-media@vger.kernel.org
   S:    Supported
   F:    drivers/media/platform/atmel/atmel-isi.c
- -F:    include/media/atmel-isi.h
+ +F:    drivers/media/platform/atmel/atmel-isi.h
   
   MICROCHIP AT91 USART MFD DRIVER
   M:    Radu Pirea <radu_nicolae.pirea@upb.ro>
@@@ -9910,13 -9849,6 +9925,13 @@@ M:    Ludovic Desroches <ludovic.desroches
   S:    Maintained
   F:    drivers/mmc/host/atmel-mci.c
   
+ +MICROCHIP MCP16502 PMIC DRIVER
+ +M:    Andrei Stefanescu <andrei.stefanescu@microchip.com>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
+ +F:    drivers/regulator/mcp16502.c
+ +
   MICROCHIP MCP3911 ADC DRIVER
   M:    Marcus Folkesson <marcus.folkesson@gmail.com>
   M:    Kent Gustavsson <kent@minoris.se>
@@@ -9954,12 -9886,6 +9969,12 @@@ M:    Nicolas Ferre <nicolas.ferre@microch
   S:    Supported
   F:    drivers/power/reset/at91-sama5d2_shdwc.c
   
+ +MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO
+ +M:    Andrei Stefanescu <andrei.stefanescu@microchip.com>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +L:    linux-gpio@vger.kernel.org
+ +F:    drivers/gpio/gpio-sama5d2-piobu.c
+ +
   MICROCHIP SPI DRIVER
   M:    Nicolas Ferre <nicolas.ferre@microchip.com>
   S:    Supported
@@@ -10022,7 -9948,6 +10037,7 @@@ F:    Documentation/scsi/smartpqi.tx
   
   MICROSEMI ETHERNET SWITCH DRIVER
   M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
+ +M:    Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    drivers/net/ethernet/mscc/
@@@ -10357,7 -10282,7 +10372,7 @@@ S:   Supporte
   F:    drivers/net/ethernet/myricom/myri10ge/
   
   NAND FLASH SUBSYSTEM
- -M:    Boris Brezillon <boris.brezillon@bootlin.com>
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
   M:    Miquel Raynal <miquel.raynal@bootlin.com>
   R:    Richard Weinberger <richard@nod.at>
   L:    linux-mtd@lists.infradead.org
@@@ -10434,8 -10359,8 +10449,8 @@@ NETERION 10GbE DRIVERS (s2io/vxge
   M:    Jon Mason <jdmason@kudzu.us>
   L:    netdev@vger.kernel.org
   S:    Supported
- -F:    Documentation/networking/s2io.txt
- -F:    Documentation/networking/vxge.txt
+ +F:    Documentation/networking/device_drivers/neterion/s2io.txt
+ +F:    Documentation/networking/device_drivers/neterion/vxge.txt
   F:    drivers/net/ethernet/neterion/
   
   NETFILTER
@@@ -10877,14 -10802,6 +10892,14 @@@ L: linux-nfc@lists.01.org (moderated fo
   S:    Supported
   F:    drivers/nfc/nxp-nci
   
+ +OBJAGG
+ +M:    Jiri Pirko <jiri@mellanox.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    lib/objagg.c
+ +F:    lib/test_objagg.c
+ +F:    include/linux/objagg.h
+ +
   OBJTOOL
   M:    Josh Poimboeuf <jpoimboe@redhat.com>
   M:    Peter Zijlstra <peterz@infradead.org>
@@@ -10892,7 -10809,7 +10907,7 @@@ S:   Supporte
   F:    tools/objtool/
   
   OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
- -M:    Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+ +M:    Frederic Barrat <fbarrat@linux.ibm.com>
   M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
   L:    linuxppc-dev@lists.ozlabs.org
   S:    Supported
@@@ -10909,10 -10826,7 +10924,10 @@@ M: Jarkko Nikula <jarkko.nikula@bitmer.
   L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
   L:    linux-omap@vger.kernel.org
   S:    Maintained
- -F:    sound/soc/omap/
+ +F:    sound/soc/ti/omap*
+ +F:    sound/soc/ti/rx51.c
+ +F:    sound/soc/ti/n810.c
+ +F:    sound/soc/ti/sdma-pcm.*
   
   OMAP CLOCK FRAMEWORK SUPPORT
   M:    Paul Walmsley <paul@pwsan.com>
@@@ -11920,12 -11834,18 +11935,12 @@@ F:        Documentation/driver-api/pinctl.rs
   F:    drivers/pinctrl/
   F:    include/linux/pinctrl/
   
- -PIN CONTROLLER - ATMEL AT91
- -M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
- -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- -S:    Maintained
- -F:    drivers/pinctrl/pinctrl-at91.*
- -
- -PIN CONTROLLER - ATMEL AT91 PIO4
+ +PIN CONTROLLER - MICROCHIP AT91
   M:    Ludovic Desroches <ludovic.desroches@microchip.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   L:    linux-gpio@vger.kernel.org
   S:    Supported
- -F:    drivers/pinctrl/pinctrl-at91-pio4.*
+ +F:    drivers/pinctrl/pinctrl-at91*
   
   PIN CONTROLLER - FREESCALE
   M:    Dong Aisheng <aisheng.dong@nxp.com>
@@@ -11961,11 -11881,11 +11976,11 @@@ F:        Documentation/devicetree/bindings/pi
   F:    drivers/pinctrl/qcom/
   
   PIN CONTROLLER - RENESAS
- -M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
   M:    Geert Uytterhoeven <geert+renesas@glider.be>
   L:    linux-renesas-soc@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
   S:    Maintained
+ +F:    drivers/pinctrl/pinctrl-rz*
   F:    drivers/pinctrl/sh-pfc/
   
   PIN CONTROLLER - SAMSUNG
@@@ -12070,13 -11990,6 +12085,13 @@@ M: "Rafael J. Wysocki" <rafael.j.wysock
   S:    Maintained
   F:    drivers/pnp/
   
+ +PNI RM3100 IIO DRIVER
+ +M:    Song Qiang <songqiang1304521@gmail.com>
+ +L:    linux-iio@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/iio/magnetometer/rm3100*
+ +F:    Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
+ +
   POSIX CLOCKS and TIMERS
   M:    Thomas Gleixner <tglx@linutronix.de>
   L:    linux-kernel@vger.kernel.org
@@@ -12449,7 -12362,7 +12464,7 @@@ QLOGIC QLA3XXX NETWORK DRIVE
   M:    Dept-GELinuxNICDev@cavium.com
   L:    netdev@vger.kernel.org
   S:    Supported
- -F:    Documentation/networking/LICENSE.qla3xxx
+ +F:    Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
   F:    drivers/net/ethernet/qlogic/qla3xxx.*
   
   QLOGIC QLA4XXX iSCSI DRIVER
@@@ -12501,7 -12414,7 +12516,7 @@@ L:   linux-kernel@vger.kernel.or
   S:    Maintained
   F:    drivers/bus/fsl-mc/
   F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
- -F:    Documentation/networking/dpaa2/overview.rst
+ +F:    Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
   
   QT1010 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
@@@ -12529,7 -12442,7 +12544,7 @@@ S:   Supporte
   F:    drivers/net/wireless/ath/ath9k/
   
   QUALCOMM CAMERA SUBSYSTEM DRIVER
- -M:    Todor Tomov <todor.tomov@linaro.org>
+ +M:    Todor Tomov <todor.too@gmail.com>
   L:    linux-media@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/media/qcom,camss.txt
@@@ -12579,13 -12492,6 +12594,13 @@@ L: linux-arm-msm@vger.kernel.or
   S:    Maintained
   F:    drivers/iommu/qcom_iommu.c
   
+ +QUALCOMM TSENS THERMAL DRIVER
+ +M:    Amit Kucheria <amit.kucheria@linaro.org>
+ +L:    linux-pm@vger.kernel.org
+ +L:    linux-arm-msm@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/thermal/qcom/
+ +
   QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
   M:    Stanimir Varbanov <stanimir.varbanov@linaro.org>
   L:    linux-media@vger.kernel.org
@@@ -12714,7 -12620,7 +12729,7 @@@ S:   Orpha
   F:    drivers/net/wireless/ray*
   
   RCUTORTURE TEST FRAMEWORK
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   M:    Josh Triplett <josh@joshtriplett.org>
   R:    Steven Rostedt <rostedt@goodmis.org>
   R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@@ -12756,17 -12662,16 +12771,17 @@@ M:        Fenghua Yu <fenghua.yu@intel.com
   M:    Reinette Chatre <reinette.chatre@intel.com>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
- -F:    arch/x86/kernel/cpu/intel_rdt*
- -F:    arch/x86/include/asm/intel_rdt_sched.h
- -F:    Documentation/x86/intel_rdt*
+ +F:    arch/x86/kernel/cpu/resctrl/
+ +F:    arch/x86/include/asm/resctrl_sched.h
+ +F:    Documentation/x86/resctrl*
   
   READ-COPY UPDATE (RCU)
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   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>
+ +R:    Joel Fernandes <joel@joelfernandes.org>
   L:    linux-kernel@vger.kernel.org
   W:    http://www.rdrop.com/users/paulmck/RCU/
   S:    Supported
@@@ -12869,8 -12774,7 +12884,8 @@@ RENESAS R-CAR GYROADC DRIVE
   M:    Marek Vasut <marek.vasut@gmail.com>
   L:    linux-iio@vger.kernel.org
   S:    Supported
- -F:    drivers/iio/adc/rcar_gyro_adc.c
+ +F:    Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt
+ +F:    drivers/iio/adc/rcar-gyroadc.c
   
   RENESAS R-CAR I2C DRIVERS
   M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
@@@ -12903,7 -12807,7 +12918,7 @@@ F:   include/linux/reset-controller.
   RESTARTABLE SEQUENCES SUPPORT
   M:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
   M:    Peter Zijlstra <peterz@infradead.org>
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   M:    Boqun Feng <boqun.feng@gmail.com>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
@@@ -12971,13 -12875,6 +12986,13 @@@ S: Maintaine
   F:    drivers/media/platform/rockchip/rga/
   F:    Documentation/devicetree/bindings/media/rockchip-rga.txt
   
+ +ROCKCHIP VPU CODEC DRIVER
+ +M:    Ezequiel Garcia <ezequiel@collabora.com>
+ +L:    linux-media@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/staging/media/platform/rockchip/vpu/
+ +F:    Documentation/devicetree/bindings/media/rockchip-vpu.txt
+ +
   ROCKER DRIVER
   M:    Jiri Pirko <jiri@resnulli.us>
   L:    netdev@vger.kernel.org
@@@ -13162,9 -13059,7 +13177,9 @@@ F:   drivers/pci/hotplug/s390_pci_hpc.
   
   S390 VFIO-CCW DRIVER
   M:    Cornelia Huck <cohuck@redhat.com>
- -M:    Halil Pasic <pasic@linux.ibm.com>
+ +M:    Farhan Ali <alifm@linux.ibm.com>
+ +M:    Eric Farman <farman@linux.ibm.com>
+ +R:    Halil Pasic <pasic@linux.ibm.com>
   L:    linux-s390@vger.kernel.org
   L:    kvm@vger.kernel.org
   S:    Supported
@@@ -13229,7 -13124,7 +13244,7 @@@ T:   git git://linuxtv.org/media_tree.gi
   S:    Maintained
   F:    drivers/media/common/saa7146/
   F:    drivers/media/pci/saa7146/
- -F:    include/media/saa7146*
+ +F:    include/media/drv-intf/saa7146*
   
   SAMSUNG AUDIO (ASoC) DRIVERS
   M:    Krzysztof Kozlowski <krzk@kernel.org>
@@@ -13437,7 -13332,7 +13452,7 @@@ F:   drivers/scsi/sg.
   F:    include/scsi/sg.h
   
   SCSI SUBSYSTEM
- -M:    "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
+ +M:    "James E.J. Bottomley" <jejb@linux.ibm.com>
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
   M:    "Martin K. Petersen" <martin.petersen@oracle.com>
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@@ -13495,12 -13390,6 +13510,12 @@@ L: sdricohcs-devel@lists.sourceforge.ne
   S:    Maintained
   F:    drivers/mmc/host/sdricoh_cs.c
   
+ +SECO BOARDS CEC DRIVER
+ +M:    Ettore Chimenti <ek5.chimenti@gmail.com>
+ +S:    Maintained
+ +F:    drivers/media/platform/seco-cec/seco-cec.c
+ +F:    drivers/media/platform/seco-cec/seco-cec.h
+ +
   SECURE COMPUTING
   M:    Kees Cook <keescook@chromium.org>
   R:    Andy Lutomirski <luto@amacapital.net>
@@@ -13878,7 -13767,7 +13893,7 @@@ F:   mm/sl?b
   
   SLEEPABLE READ-COPY UPDATE (SRCU)
   M:    Lai Jiangshan <jiangshanlai@gmail.com>
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   M:    Josh Triplett <josh@joshtriplett.org>
   R:    Steven Rostedt <rostedt@goodmis.org>
   R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@@ -14074,14 -13963,6 +14089,14 @@@ S: Maintaine
   F:    drivers/ssb/
   F:    include/linux/ssb/
   
+ +SONY IMX214 SENSOR DRIVER
+ +M:    Ricardo Ribalda <ricardo.ribalda@gmail.com>
+ +L:    linux-media@vger.kernel.org
+ +T:    git git://linuxtv.org/media_tree.git
+ +S:    Maintained
+ +F:    drivers/media/i2c/imx214.c
+ +F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
+ +
   SONY IMX258 SENSOR DRIVER
   M:    Sakari Ailus <sakari.ailus@linux.intel.com>
   L:    linux-media@vger.kernel.org
@@@ -14273,7 -14154,7 +14288,7 @@@ SPIDERNET NETWORK DRIVER for CEL
   M:    Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
   L:    netdev@vger.kernel.org
   S:    Supported
- -F:    Documentation/networking/spider_net.txt
+ +F:    Documentation/networking/device_drivers/toshiba/spider_net.txt
   F:    drivers/net/ethernet/toshiba/spider_net*
   
   SPMI SUBSYSTEM
@@@ -14307,14 -14188,6 +14322,14 @@@ M: Jan-Benedict Glaw <jbglaw@lug-owl.de
   S:    Maintained
   F:    arch/alpha/kernel/srm_env.c
   
+ +ST LSM6DSx IMU IIO DRIVER
+ +M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+ +L:    linux-iio@vger.kernel.org
+ +W:    http://www.st.com/
+ +S:    Maintained
+ +F:    drivers/iio/imu/st_lsm6dsx/
+ +F:    Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
+ +
   ST STM32 I2C/SMBUS DRIVER
   M:    Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
   L:    linux-i2c@vger.kernel.org
@@@ -14400,8 -14273,8 +14415,8 @@@ S:   Odd Fixe
   F:    drivers/staging/vt665?/
   
   STAGING - WILC1000 WIFI DRIVER
- -M:    Aditya Shankar <aditya.shankar@microchip.com>
- -M:    Ganesh Krishna <ganesh.krishna@microchip.com>
+ +M:    Adham Abozaeid <adham.abozaeid@microchip.com>
+ +M:    Ajay Singh <ajay.kathat@microchip.com>
   L:    linux-wireless@vger.kernel.org
   S:    Supported
   F:    drivers/staging/wilc1000/
@@@ -14631,11 -14504,9 +14646,11 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
   M:    Viresh Kumar <vireshk@kernel.org>
   R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/dma/snps-dma.txt
+ +F:    drivers/dma/dw/
+ +F:    include/dt-bindings/dma/dw-dmac.h
   F:    include/linux/dma/dw.h
   F:    include/linux/platform_data/dma-dw.h
- -F:    drivers/dma/dw/
   
   SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
   M:    Jose Abreu <Jose.Abreu@synopsys.com>
@@@ -14999,12 -14870,6 +15014,12 @@@ F: Documentation/devicetree/bindings/cl
   F:    drivers/clk/keystone/sci-clk.c
   F:    drivers/reset/reset-ti-sci.c
   
+ +Texas Instruments ASoC drivers
+ +M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
+ +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    sound/soc/ti/
+ +
   THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
@@@ -15279,7 -15144,7 +15294,7 @@@ M:   Samuel Chessman <chessman@tux.org
   L:    tlan-devel@lists.sourceforge.net (subscribers-only)
   W:    http://sourceforge.net/projects/tlan/
   S:    Maintained
- -F:    Documentation/networking/tlan.txt
+ +F:    Documentation/networking/device_drivers/ti/tlan.txt
   F:    drivers/net/ethernet/ti/tlan.*
   
   TM6000 VIDEO4LINUX DRIVER
@@@ -15333,7 -15198,7 +15348,7 @@@ F:   drivers/platform/x86/topstar-laptop.
   
   TORTURE-TEST MODULES
   M:    Davidlohr Bueso <dave@stgolabs.net>
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   M:    Josh Triplett <josh@joshtriplett.org>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
@@@ -15951,16 -15816,15 +15966,16 @@@ F:        drivers/media/usb/zr364xx
   USER-MODE LINUX (UML)
   M:    Jeff Dike <jdike@addtoit.com>
   M:    Richard Weinberger <richard@nod.at>
+ +M:    Anton Ivanov <anton.ivanov@cambridgegreys.com>
   L:    linux-um@lists.infradead.org
   W:    http://user-mode-linux.sourceforge.net
+ +Q:    https://patchwork.ozlabs.org/project/linux-um/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
   S:    Maintained
   F:    Documentation/virtual/uml/
   F:    arch/um/
   F:    arch/x86/um/
   F:    fs/hostfs/
- -F:    fs/hppfs/
   
   USERSPACE COPYIN/COPYOUT (UIOVEC)
   M:    Alexander Viro <viro@zeniv.linux.org.uk>
@@@ -16253,7 -16117,7 +16268,7 @@@ F:   drivers/vme
   F:    include/linux/vme*
   
   VMWARE BALLOON DRIVER
- -M:    Xavier Deguillard <xdeguillard@vmware.com>
+ +M:    Julien Freche <jfreche@vmware.com>
   M:    Nadav Amit <namit@vmware.com>
   M:    "VMware, Inc." <pv-drivers@vmware.com>
   L:    linux-kernel@vger.kernel.org
@@@ -16593,12 -16457,6 +16608,12 @@@ F: include/linux/idr.
   F:    include/linux/xarray.h
   F:    tools/testing/radix-tree
   
+ +XBOX DVD IR REMOTE
+ +M:    Benjamin Valentin <benpicco@googlemail.com>
+ +S:    Maintained
+ +F:    drivers/media/rc/xbox_remote.c
+ +F:    drivers/media/rc/keymaps/rc-xbox-dvd.c
+ +
   XC2028/3028 TUNER DRIVER
   M:    Mauro Carvalho Chehab <mchehab@kernel.org>
   L:    linux-media@vger.kernel.org
@@@ -16645,7 -16503,6 +16660,7 @@@ L:   xen-devel@lists.xenproject.org (mode
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
   S:    Supported
   F:    arch/x86/xen/
+ +F:    arch/x86/platform/pvh/
   F:    drivers/*/xen-*front.c
   F:    drivers/xen/
   F:    arch/x86/include/asm/xen/
diff --combined arch/arm/Kconfig

index c1227757817ba713b5d5d83b8becfdfba8b122fd,084f0983e6b2550375a955cd90e1ffbc5e000d8b..664e918e26249a6dd0a43fa1c80eaf187a040821
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -19,7 -19,6 +19,7 @@@ config AR
         select ARCH_HAVE_CUSTOM_GPIO_H
         select ARCH_HAS_GCOV_PROFILE_ALL
         select ARCH_MIGHT_HAVE_PC_PARPORT
+ +      select ARCH_NO_SG_CHAIN if !ARM_HAS_SG_CHAIN
         select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
         select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7
         select ARCH_SUPPORTS_ATOMIC_RMW
@@@ -28,14 -27,14 +28,14 @@@
         select ARCH_WANT_IPC_PARSE_VERSION
         select BUILDTIME_EXTABLE_SORT if MMU
         select CLONE_BACKWARDS
- -      select CPU_PM if (SUSPEND || CPU_IDLE)
+ +      select CPU_PM if SUSPEND || CPU_IDLE
         select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
- -      select DMA_DIRECT_OPS if !MMU
+ +      select DMA_REMAP if MMU
         select EDAC_SUPPORT
         select EDAC_ATOMIC_SCRUB
         select GENERIC_ALLOCATOR
         select GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY
- -      select GENERIC_ATOMIC64 if (CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI)
+ +      select GENERIC_ATOMIC64 if CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI
         select GENERIC_CLOCKEVENTS_BROADCAST if SMP
         select GENERIC_CPU_AUTOPROBE
         select GENERIC_EARLY_IOREMAP
@@@ -50,12 -49,12 +50,12 @@@
         select GENERIC_STRNLEN_USER
         select HANDLE_DOMAIN_IRQ
         select HARDIRQS_SW_RESEND
- -      select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
+ +      select HAVE_ARCH_AUDITSYSCALL if AEABI && !OABI_COMPAT
         select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
         select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
         select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
         select HAVE_ARCH_MMAP_RND_BITS if MMU
- -      select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
+ +      select HAVE_ARCH_SECCOMP_FILTER if AEABI && !OABI_COMPAT
         select HAVE_ARCH_THREAD_STRUCT_WHITELIST
         select HAVE_ARCH_TRACEHOOK
         select HAVE_ARM_SMCCC if CPU_V7
@@@ -64,16 -63,16 +64,16 @@@
         select HAVE_C_RECORDMCOUNT
         select HAVE_DEBUG_KMEMLEAK
         select HAVE_DMA_CONTIGUOUS if MMU
- -      select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32 && MMU
+ +      select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
         select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
         select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU
         select HAVE_EXIT_THREAD
- -      select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
- -      select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
- -      select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+ +      select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
+ +      select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL
+ +      select HAVE_FUNCTION_TRACER if !XIP_KERNEL
         select HAVE_GCC_PLUGINS
         select HAVE_GENERIC_DMA_COHERENT
- -      select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
+ +      select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
         select HAVE_IDE if PCI || ISA || PCMCIA
         select HAVE_IRQ_TIME_ACCOUNTING
         select HAVE_KERNEL_GZIP
@@@ -82,15 -81,15 +82,15 @@@
         select HAVE_KERNEL_LZO
         select HAVE_KERNEL_XZ
         select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M
- -      select HAVE_KRETPROBES if (HAVE_KPROBES)
+ +      select HAVE_KRETPROBES if HAVE_KPROBES
         select HAVE_MOD_ARCH_SPECIFIC
         select HAVE_NMI
- -      select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
+ +      select HAVE_OPROFILE if HAVE_PERF_EVENTS
         select HAVE_OPTPROBES if !THUMB2_KERNEL
         select HAVE_PERF_EVENTS
         select HAVE_PERF_REGS
         select HAVE_PERF_USER_STACK_DUMP
- -      select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
+ +      select HAVE_RCU_TABLE_FREE if SMP && ARM_LPAE
         select HAVE_REGS_AND_STACK_ACCESS_API
         select HAVE_RSEQ
         select HAVE_STACKPROTECTOR
@@@ -104,7 -103,6 +104,7 @@@
         select OF_RESERVED_MEM if OF
         select OLD_SIGACTION
         select OLD_SIGSUSPEND3
+ +      select PCI_SYSCALL if PCI
         select PERF_USE_VMALLOC
         select REFCOUNT_FULL
         select RTC_LIB
@@@ -120,6 -118,7 +120,6 @@@
           <http://www.arm.linux.org.uk/>.
   
   config ARM_HAS_SG_CHAIN
- -      select ARCH_HAS_SG_CHAIN
         bool
   
   config ARM_DMA_USE_IOMMU
@@@ -148,6 -147,9 +148,6 @@@ config ARM_DMA_IOMMU_ALIGNMEN
   
   endif
   
- -config MIGHT_HAVE_PCI
- -      bool
- -
   config SYS_SUPPORTS_APM_EMULATION
         bool
   
@@@ -161,6 -163,21 +161,6 @@@ config HAVE_PROC_CP
   config NO_IOPORT_MAP
         bool
   
- -config EISA
- -      bool
- -      ---help---
- -        The Extended Industry Standard Architecture (EISA) bus was
- -        developed as an open alternative to the IBM MicroChannel bus.
- -
- -        The EISA bus provided some of the features of the IBM MicroChannel
- -        bus while maintaining backward compatibility with cards made for
- -        the older ISA bus.  The EISA bus saw limited use between 1988 and
- -        1995 when it was made obsolete by the PCI bus.
- -
- -        Say Y here if you are building a kernel for an EISA-based machine.
- -
- -        Otherwise, say N.
- -
   config SBUS
         bool
   
@@@ -316,8 -333,8 +316,8 @@@ config ARCH_MULTIPLATFOR
         select COMMON_CLK
         select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_MULTI_HANDLER
- -      select MIGHT_HAVE_PCI
- -      select PCI_DOMAINS if PCI
+ +      select HAVE_PCI
+ +      select PCI_DOMAINS_GENERIC if PCI
         select SPARSE_IRQ
         select USE_OF
   
@@@ -390,7 -407,7 +390,7 @@@ config ARCH_IOP13X
         select CPU_XSC3
         select NEED_MACH_MEMORY_H
         select NEED_RET_TO_USER
- -      select PCI
+ +      select FORCE_PCI
         select PLAT_IOP
         select VMSPLIT_1G
         select SPARSE_IRQ
@@@ -404,7 -421,7 +404,7 @@@ config ARCH_IOP32
         select GPIO_IOP
         select GPIOLIB
         select NEED_RET_TO_USER
- -      select PCI
+ +      select FORCE_PCI
         select PLAT_IOP
         help
           Support for Intel's 80219 and IOP32X (XScale) family of
@@@ -417,7 -434,7 +417,7 @@@ config ARCH_IOP33
         select GPIO_IOP
         select GPIOLIB
         select NEED_RET_TO_USER
- -      select PCI
+ +      select FORCE_PCI
         select PLAT_IOP
         help
           Support for Intel's IOP33X (XScale) family of processors.
@@@ -432,7 -449,7 +432,7 @@@ config ARCH_IXP4X
         select DMABOUNCE if PCI
         select GENERIC_CLOCKEVENTS
         select GPIOLIB
- -      select MIGHT_HAVE_PCI
+ +      select HAVE_PCI
         select NEED_MACH_IO_H
         select USB_EHCI_BIG_ENDIAN_DESC
         select USB_EHCI_BIG_ENDIAN_MMIO
@@@ -445,7 -462,7 +445,7 @@@ config ARCH_DOV
         select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_MULTI_HANDLER
         select GPIOLIB
- -      select MIGHT_HAVE_PCI
+ +      select HAVE_PCI
         select MVEBU_MBUS
         select PINCTRL
         select PINCTRL_DOVE
@@@ -787,6 -804,8 +787,8 @@@ source "arch/arm/plat-pxa/Kconfig
   
   source "arch/arm/mach-qcom/Kconfig"
   
+ source "arch/arm/mach-rda/Kconfig"
+ 
   source "arch/arm/mach-realview/Kconfig"
   
   source "arch/arm/mach-rockchip/Kconfig"
@@@ -893,7 -912,7 +895,7 @@@ config PLAT_VERSATIL
   
   source "arch/arm/firmware/Kconfig"
   
- -source arch/arm/mm/Kconfig
+ +source "arch/arm/mm/Kconfig"
   
   config IWMMXT
         bool "Enable iWMMXt support"
@@@ -1213,18 -1232,46 +1215,18 @@@ config ISA_DM
   config ISA_DMA_API
         bool
   
- -config PCI
- -      bool "PCI support" if MIGHT_HAVE_PCI
- -      help
- -        Find out whether you have a PCI motherboard. PCI is the name of a
- -        bus system, i.e. the way the CPU talks to the other stuff inside
- -        your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
- -        VESA. If you have PCI, say Y, otherwise N.
- -
- -config PCI_DOMAINS
- -      bool "Support for multiple PCI domains"
- -      depends on PCI
- -      help
- -        Enable PCI domains kernel management. Say Y if your machine
- -        has a PCI bus hierarchy that requires more than one PCI
- -        domain (aka segment) to be correctly managed. Say N otherwise.
- -
- -        If you don't know what to do here, say N.
- -
- -config PCI_DOMAINS_GENERIC
- -      def_bool PCI_DOMAINS
- -
   config PCI_NANOENGINE
         bool "BSE nanoEngine PCI support"
         depends on SA1100_NANOENGINE
         help
           Enable PCI on the BSE nanoEngine board.
   
- -config PCI_SYSCALL
- -      def_bool PCI
- -
   config PCI_HOST_ITE8152
         bool
         depends on PCI && MACH_ARMCORE
         default y
         select DMABOUNCE
   
- -source "drivers/pci/Kconfig"
- -
- -source "drivers/pcmcia/Kconfig"
- -
   endmenu
   
   menu "Kernel Features"
@@@ -1738,6 -1785,7 +1740,6 @@@ config PARAVIR
   config PARAVIRT_TIME_ACCOUNTING
         bool "Paravirtual steal time accounting"
         select PARAVIRT
- -      default n
         help
           Select this option to enable fine granularity task steal time
           accounting. Time spent executing other tasks in parallel with
@@@ -1764,21 -1812,6 +1766,21 @@@ config XE
         help
           Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
   
+ +config STACKPROTECTOR_PER_TASK
+ +      bool "Use a unique stack canary value for each task"
+ +      depends on GCC_PLUGINS && STACKPROTECTOR && SMP && !XIP_DEFLATED_DATA
+ +      select GCC_PLUGIN_ARM_SSP_PER_TASK
+ +      default y
+ +      help
+ +        Due to the fact that GCC uses an ordinary symbol reference from
+ +        which to load the value of the stack canary, this value can only
+ +        change at reboot time on SMP systems, and all tasks running in the
+ +        kernel's address space are forced to use the same canary value for
+ +        the entire duration that the system is up.
+ +
+ +        Enable this option to switch to a different method that uses a
+ +        different canary value for each task.
+ +
   endmenu
   
   menu "Boot options"
diff --combined arch/arm/Makefile

index 0436002d509190c38fd6d037967b0ebf4df9a4f7,10056ccdb8be2c5592e6d37f8fcc512378912dac..9db3c584b2cb46fb45d10a61b72be150a830435d
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -202,6 -202,7 +202,7 @@@ machine-$(CONFIG_ARCH_ORION5X)             += orio
   machine-$(CONFIG_ARCH_PICOXCELL)      += picoxcell
   machine-$(CONFIG_ARCH_PXA)            += pxa
   machine-$(CONFIG_ARCH_QCOM)           += qcom
+ machine-$(CONFIG_ARCH_RDA)            += rda
   machine-$(CONFIG_ARCH_REALVIEW)               += realview
   machine-$(CONFIG_ARCH_ROCKCHIP)               += rockchip
   machine-$(CONFIG_ARCH_RPC)            += rpc
@@@ -303,18 -304,6 +304,18 @@@ els
   KBUILD_IMAGE := $(boot)/zImage
   endif
   
+ +ifeq ($(CONFIG_STACKPROTECTOR_PER_TASK),y)
+ +prepare: stack_protector_prepare
+ +stack_protector_prepare: prepare0
+ +      $(eval KBUILD_CFLAGS += \
+ +              -fplugin-arg-arm_ssp_per_task_plugin-tso=$(shell        \
+ +                      awk '{if ($$2 == "THREAD_SZ_ORDER") print $$3;}'\
+ +                              include/generated/asm-offsets.h)        \
+ +              -fplugin-arg-arm_ssp_per_task_plugin-offset=$(shell     \
+ +                      awk '{if ($$2 == "TI_STACK_CANARY") print $$3;}'\
+ +                              include/generated/asm-offsets.h))
+ +endif
+ +
   all:  $(notdir $(KBUILD_IMAGE))
   
   
diff --combined arch/arm/boot/dts/Makefile

index 78551c4375d5203ff4cc47e53a7d12d7c87246d5,cfb08ea338725c6909f1e8e9872f5308ddda0d3d..bd40148a15b26362ead2215c8f481d8c857450a0
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -89,7 -89,6 +89,7 @@@ dtb-$(CONFIG_ARCH_BCM_5301X) += 
         bcm4708-asus-rt-ac68u.dtb \
         bcm4708-buffalo-wzr-1750dhp.dtb \
         bcm4708-linksys-ea6300-v1.dtb \
+ +      bcm4708-linksys-ea6500-v2.dtb \
         bcm4708-luxul-xap-1510.dtb \
         bcm4708-luxul-xwc-1000.dtb \
         bcm4708-netgear-r6250.dtb \
@@@ -397,7 -396,6 +397,7 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
         imx6dl-cubox-i-emmc-som-v15.dtb \
         imx6dl-cubox-i-som-v15.dtb \
         imx6dl-dfi-fs700-m60.dtb \
+ +      imx6dl-emcon-avari.dtb \
         imx6dl-gw51xx.dtb \
         imx6dl-gw52xx.dtb \
         imx6dl-gw53xx.dtb \
@@@ -462,7 -460,6 +462,7 @@@
         imx6q-display5-tianma-tm070-1280x768.dtb \
         imx6q-dmo-edmqmx6.dtb \
         imx6q-dms-ba16.dtb \
+ +      imx6q-emcon-avari.dtb \
         imx6q-evi.dtb \
         imx6q-gk802.dtb \
         imx6q-gw51xx.dtb \
@@@ -560,7 -557,6 +560,7 @@@ dtb-$(CONFIG_SOC_IMX6UL) += 
         imx6ul-liteboard.dtb \
         imx6ul-opos6uldev.dtb \
         imx6ul-pico-hobbit.dtb \
+ +      imx6ul-pico-pi.dtb \
         imx6ul-tx6ul-0010.dtb \
         imx6ul-tx6ul-0011.dtb \
         imx6ul-tx6ul-mainboard.dtb \
@@@ -573,23 -569,18 +573,23 @@@ dtb-$(CONFIG_SOC_IMX7D) += 
         imx7d-colibri-emmc-eval-v3.dtb \
         imx7d-colibri-eval-v3.dtb \
         imx7d-nitrogen7.dtb \
+ +      imx7d-pico-hobbit.dtb \
         imx7d-pico-pi.dtb \
         imx7d-sbc-imx7.dtb \
         imx7d-sdb.dtb \
+ +      imx7d-sdb-reva.dtb \
         imx7d-sdb-sht11.dtb \
         imx7s-colibri-eval-v3.dtb \
         imx7s-warp.dtb
+ +dtb-$(CONFIG_SOC_IMX7ULP) += \
+ +      imx7ulp-evk.dtb
   dtb-$(CONFIG_SOC_LS1021A) += \
         ls1021a-moxa-uc-8410a.dtb \
         ls1021a-qds.dtb \
         ls1021a-twr.dtb
   dtb-$(CONFIG_SOC_VF610) += \
         vf500-colibri-eval-v3.dtb \
+ +      vf610-bk4.dtb \
         vf610-colibri-eval-v3.dtb \
         vf610m4-colibri.dtb \
         vf610-cosmic.dtb \
@@@ -598,7 -589,6 +598,7 @@@
         vf610-zii-cfu1.dtb \
         vf610-zii-dev-rev-b.dtb \
         vf610-zii-dev-rev-c.dtb \
+ +      vf610-zii-scu4-aib.dtb \
         vf610-zii-ssmb-spu3.dtb
   dtb-$(CONFIG_ARCH_MXS) += \
         imx23-evk.dtb \
@@@ -788,18 -778,12 +788,18 @@@ dtb-$(CONFIG_ARCH_ACTIONS) += 
         owl-s500-sparky.dtb
   dtb-$(CONFIG_ARCH_PRIMA2) += \
         prima2-evb.dtb
+ +dtb-$(CONFIG_ARCH_PXA) += \
+ +      pxa300-raumfeld-connector.dtb \
+ +      pxa300-raumfeld-controller.dtb \
+ +      pxa300-raumfeld-speaker-l.dtb \
+ +      pxa300-raumfeld-speaker-m.dtb \
+ +      pxa300-raumfeld-speaker-one.dtb \
+ +      pxa300-raumfeld-speaker-s.dtb
   dtb-$(CONFIG_ARCH_OXNAS) += \
         ox810se-wd-mbwe.dtb \
         ox820-cloudengines-pogoplug-series-3.dtb
   dtb-$(CONFIG_ARCH_QCOM) += \
         qcom-apq8060-dragonboard.dtb \
- -      qcom-apq8064-arrow-sd-600eval.dtb \
         qcom-apq8064-cm-qs600.dtb \
         qcom-apq8064-ifc6410.dtb \
         qcom-apq8064-sony-xperia-yuga.dtb \
@@@ -822,6 -806,9 +822,9 @@@
         qcom-msm8974-sony-xperia-castor.dtb \
         qcom-msm8974-sony-xperia-honami.dtb \
         qcom-mdm9615-wp8548-mangoh-green.dtb
+ dtb-$(CONFIG_ARCH_RDA) += \
+       rda8810pl-orangepi-2g-iot.dtb \
+       rda8810pl-orangepi-i96.dtb
   dtb-$(CONFIG_ARCH_REALVIEW) += \
         arm-realview-pb1176.dtb \
         arm-realview-pb11mp.dtb \
@@@ -845,8 -832,6 +848,8 @@@ dtb-$(CONFIG_ARCH_RENESAS) += 
         r8a7743-iwg20d-q7.dtb \
         r8a7743-iwg20d-q7-dbcm-ca.dtb \
         r8a7743-sk-rzg1m.dtb \
+ +      r8a7744-iwg20d-q7.dtb \
+ +      r8a7744-iwg20d-q7-dbcm-ca.dtb \
         r8a7745-iwg22d-sodimm.dtb \
         r8a7745-iwg22d-sodimm-dbhd-ca.dtb \
         r8a7745-sk-rzg1e.dtb \
@@@ -872,7 -857,6 +875,7 @@@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
         rk3066a-marsboard.dtb \
         rk3066a-mk808.dtb \
         rk3066a-rayeager.dtb \
+ +      rk3188-bqedison2qc.dtb \
         rk3188-px3-evb.dtb \
         rk3188-radxarock.dtb \
         rk3228-evb.dtb \
@@@ -1062,7 -1046,6 +1065,7 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
         sun8i-h3-bananapi-m2-plus-v1.2.dtb \
         sun8i-h3-beelink-x2.dtb \
         sun8i-h3-libretech-all-h3-cc.dtb \
+ +      sun8i-h3-mapleboard-mp130.dtb \
         sun8i-h3-nanopi-m1.dtb  \
         sun8i-h3-nanopi-m1-plus.dtb \
         sun8i-h3-nanopi-neo.dtb \
@@@ -1080,15 -1063,12 +1083,15 @@@
         sun8i-r16-nintendo-super-nes-classic.dtb \
         sun8i-r16-parrot.dtb \
         sun8i-r40-bananapi-m2-ultra.dtb \
+ +      sun8i-t3-cqa3t-bv3.dtb \
         sun8i-v3s-licheepi-zero.dtb \
         sun8i-v3s-licheepi-zero-dock.dtb \
         sun8i-v40-bananapi-m2-berry.dtb
   dtb-$(CONFIG_MACH_SUN9I) += \
         sun9i-a80-optimus.dtb \
         sun9i-a80-cubieboard4.dtb
+ +dtb-$(CONFIG_MACH_SUNIV) += \
+ +      suniv-f1c100s-licheepi-nano.dtb
   dtb-$(CONFIG_ARCH_TANGO) += \
         tango4-vantage-1172.dtb
   dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
@@@ -1235,7 -1215,6 +1238,7 @@@ dtb-$(CONFIG_ARCH_ASPEED) += 
         aspeed-ast2500-evb.dtb \
         aspeed-bmc-arm-centriq2400-rep.dtb \
         aspeed-bmc-arm-stardragon4800-rep2.dtb \
+ +      aspeed-bmc-facebook-cmm.dtb \
         aspeed-bmc-facebook-tiogapass.dtb \
         aspeed-bmc-intel-s2600wf.dtb \
         aspeed-bmc-opp-lanyang.dtb \
diff --combined arch/arm/configs/multi_v7_defconfig

index f29f49a9f36c9679a77e738e030a7241bfdfa818,715da886046ae8da029612e85a2791936d4222d3..5bee34a7ff2e45f6aabaa17453e6efd6145ce5c1
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -304,7 -304,6 +304,7 @@@ CONFIG_SERIAL_8250_SHARE_IRQ=
   CONFIG_SERIAL_8250_BCM2835AUX=y
   CONFIG_SERIAL_8250_DW=y
   CONFIG_SERIAL_8250_EM=y
+ +CONFIG_SERIAL_8250_OMAP=y
   CONFIG_SERIAL_8250_MT6577=y
   CONFIG_SERIAL_8250_UNIPHIER=y
   CONFIG_SERIAL_OF_PLATFORM=y
@@@ -522,7 -521,6 +522,7 @@@ CONFIG_MFD_TPS65217=
   CONFIG_MFD_TPS65218=y
   CONFIG_MFD_TPS6586X=y
   CONFIG_MFD_TPS65910=y
+ +CONFIG_MFD_STM32_LPTIMER=m
   CONFIG_REGULATOR_ACT8865=y
   CONFIG_REGULATOR_ACT8945A=y
   CONFIG_REGULATOR_ANATOP=y
@@@ -538,7 -536,6 +538,7 @@@ CONFIG_REGULATOR_GPIO=
   CONFIG_REGULATOR_LP872X=y
   CONFIG_REGULATOR_MAX14577=m
   CONFIG_REGULATOR_MAX8907=y
+ +CONFIG_REGULATOR_MAX8952=m
   CONFIG_REGULATOR_MAX8973=y
   CONFIG_REGULATOR_MAX8997=m
   CONFIG_REGULATOR_MAX8998=m
@@@ -554,7 -551,6 +554,7 @@@ CONFIG_REGULATOR_RK808=
   CONFIG_REGULATOR_RN5T618=y
   CONFIG_REGULATOR_S2MPS11=y
   CONFIG_REGULATOR_S5M8767=y
+ +CONFIG_REGULATOR_STM32_VREFBUF=m
   CONFIG_REGULATOR_TI_ABB=y
   CONFIG_REGULATOR_TPS51632=y
   CONFIG_REGULATOR_TPS62360=y
@@@ -632,7 -628,6 +632,7 @@@ CONFIG_DRM_DUMB_VGA_DAC=
   CONFIG_DRM_NXP_PTN3460=m
   CONFIG_DRM_PARADE_PS8622=m
   CONFIG_DRM_SII9234=m
+ +CONFIG_DRM_TOSHIBA_TC358764=m
   CONFIG_DRM_I2C_ADV7511=m
   CONFIG_DRM_I2C_ADV7511_AUDIO=y
   CONFIG_DRM_STI=m
@@@ -867,6 -862,7 +867,7 @@@ CONFIG_STM32_DMA=
   CONFIG_STM32_DMAMUX=y
   CONFIG_STM32_MDMA=y
   CONFIG_TEGRA20_APB_DMA=y
+ CONFIG_UNIPHIER_MDMAC=y
   CONFIG_XILINX_DMA=y
   CONFIG_QCOM_BAM_DMA=y
   CONFIG_DW_DMAC=y
@@@ -918,20 -914,14 +919,20 @@@ CONFIG_AT91_SAMA5D2_ADC=
   CONFIG_BERLIN2_ADC=m
   CONFIG_CPCAP_ADC=m
   CONFIG_EXYNOS_ADC=m
+ +CONFIG_STM32_ADC_CORE=m
+ +CONFIG_STM32_ADC=m
+ +CONFIG_STM32_DFSDM_ADC=m
   CONFIG_VF610_ADC=m
   CONFIG_XILINX_XADC=y
+ +CONFIG_STM32_LPTIMER_CNT=m
+ +CONFIG_STM32_DAC=m
   CONFIG_MPU3050_I2C=y
   CONFIG_CM36651=m
   CONFIG_SENSORS_ISL29018=y
   CONFIG_SENSORS_ISL29028=y
   CONFIG_AK8975=y
   CONFIG_IIO_HRTIMER_TRIGGER=y
+ +CONFIG_IIO_STM32_LPTIMER_TRIGGER=m
   CONFIG_PWM=y
   CONFIG_PWM_ATMEL=m
   CONFIG_PWM_ATMEL_HLCDC_PWM=m
@@@ -945,8 -935,6 +946,8 @@@ CONFIG_PWM_RENESAS_TPU=
   CONFIG_PWM_ROCKCHIP=m
   CONFIG_PWM_SAMSUNG=m
   CONFIG_PWM_STI=y
+ +CONFIG_PWM_STM32=m
+ +CONFIG_PWM_STM32_LP=m
   CONFIG_PWM_SUN4I=y
   CONFIG_PWM_TEGRA=y
   CONFIG_PWM_VT8500=y
diff --combined arch/arm64/Kconfig.platforms

index 28f052185eb6e6b37865d5bb52bad6f6547620a3,3e177a332b92c21300cf4e9988e5b98d879fc98c..251ecf34cb020710a62363a86b65d4b3d7ffeba2
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -142,6 -142,14 +142,14 @@@ config ARCH_MVEB
            - Armada 7K SoC Family
            - Armada 8K SoC Family
   
+ config ARCH_MXC
+       bool "ARMv8 based NXP i.MX SoC family"
+       select ARM64_ERRATUM_843419
+       select ARM64_ERRATUM_845719
+       help
+         This enables support for the ARMv8 based SoCs in the
+         NXP i.MX family.
+ 
   config ARCH_QCOM
         bool "Qualcomm Platforms"
         select GPIOLIB
@@@ -157,12 -165,70 +165,12 @@@ config ARCH_REALTE
   
   config ARCH_RENESAS
         bool "Renesas SoC Platforms"
+ +      select GPIOLIB
         select PINCTRL
- -      select PM
- -      select PM_GENERIC_DOMAINS
- -      select RENESAS_IRQC
         select SOC_BUS
- -      select SYS_SUPPORTS_SH_CMT
- -      select SYS_SUPPORTS_SH_TMU
         help
           This enables support for the ARMv8 based Renesas SoCs.
   
- -config ARCH_R8A774A1
- -      bool "Renesas RZ/G2M SoC Platform"
- -      depends on ARCH_RENESAS
- -      help
- -        This enables support for the Renesas RZ/G2M SoC.
- -
- -config ARCH_R8A774C0
- -      bool "Renesas RZ/G2E SoC Platform"
- -      depends on ARCH_RENESAS
- -      help
- -        This enables support for the Renesas RZ/G2E SoC.
- -
- -config ARCH_R8A7795
- -      bool "Renesas R-Car H3 SoC Platform"
- -      depends on ARCH_RENESAS
- -      help
- -        This enables support for the Renesas R-Car H3 SoC.
- -
- -config ARCH_R8A7796
- -      bool "Renesas R-Car M3-W SoC Platform"
- -      depends on ARCH_RENESAS
- -      help
- -        This enables support for the Renesas R-Car M3-W SoC.
- -
- -config ARCH_R8A77965
- -      bool "Renesas R-Car M3-N SoC Platform"
- -      depends on ARCH_RENESAS
- -      help
- -        This enables support for the Renesas R-Car M3-N SoC.
- -
- -config ARCH_R8A77970
- -      bool "Renesas R-Car V3M SoC Platform"
- -      depends on ARCH_RENESAS
- -      help
- -        This enables support for the Renesas R-Car V3M SoC.
- -
- -config ARCH_R8A77980
- -      bool "Renesas R-Car V3H SoC Platform"
- -      depends on ARCH_RENESAS
- -      help
- -        This enables support for the Renesas R-Car V3H SoC.
- -
- -config ARCH_R8A77990
- -      bool "Renesas R-Car E3 SoC Platform"
- -      depends on ARCH_RENESAS
- -      help
- -        This enables support for the Renesas R-Car E3 SoC.
- -
- -config ARCH_R8A77995
- -      bool "Renesas R-Car D3 SoC Platform"
- -      depends on ARCH_RENESAS
- -      help
- -        This enables support for the Renesas R-Car D3 SoC.
- -
   config ARCH_ROCKCHIP
         bool "Rockchip Platforms"
         select ARCH_HAS_RESET_CONTROLLER
diff --combined arch/arm64/configs/defconfig

index d0724d4e0546d85c20b377619fbfd8d662664adf,641ad73a938f1b12fdd6cdad8569db5c175bf596..3ef443cfbab628b7bbadaff86edf421e0ffa0a74
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -3,7 -3,6 +3,7 @@@ CONFIG_POSIX_MQUEUE=
   CONFIG_AUDIT=y
   CONFIG_NO_HZ_IDLE=y
   CONFIG_HIGH_RES_TIMERS=y
+ +CONFIG_PREEMPT=y
   CONFIG_IRQ_TIME_ACCOUNTING=y
   CONFIG_BSD_PROCESS_ACCT=y
   CONFIG_BSD_PROCESS_ACCT_V3=y
@@@ -29,6 -28,9 +29,6 @@@ CONFIG_BLK_DEV_INITRD=
   CONFIG_KALLSYMS_ALL=y
   # CONFIG_COMPAT_BRK is not set
   CONFIG_PROFILING=y
- -CONFIG_JUMP_LABEL=y
- -CONFIG_MODULES=y
- -CONFIG_MODULE_UNLOAD=y
   CONFIG_ARCH_SUNXI=y
   CONFIG_ARCH_ALPINE=y
   CONFIG_ARCH_BCM2835=y
@@@ -44,6 -46,9 +44,6 @@@ CONFIG_ARCH_MEDIATEK=
   CONFIG_ARCH_MESON=y
   CONFIG_ARCH_MVEBU=y
   CONFIG_ARCH_QCOM=y
- -CONFIG_ARCH_ROCKCHIP=y
- -CONFIG_ARCH_SEATTLE=y
- -CONFIG_ARCH_SYNQUACER=y
   CONFIG_ARCH_RENESAS=y
   CONFIG_ARCH_R8A774A1=y
   CONFIG_ARCH_R8A774C0=y
@@@ -54,10 -59,7 +54,10 @@@ CONFIG_ARCH_R8A77970=
   CONFIG_ARCH_R8A77980=y
   CONFIG_ARCH_R8A77990=y
   CONFIG_ARCH_R8A77995=y
+ +CONFIG_ARCH_ROCKCHIP=y
+ +CONFIG_ARCH_SEATTLE=y
   CONFIG_ARCH_STRATIX10=y
+ +CONFIG_ARCH_SYNQUACER=y
   CONFIG_ARCH_TEGRA=y
   CONFIG_ARCH_SPRD=y
   CONFIG_ARCH_THUNDER=y
@@@ -89,10 -91,16 +89,10 @@@ CONFIG_PCIE_HISI_STB=
   CONFIG_ARM64_VA_BITS_48=y
   CONFIG_SCHED_MC=y
   CONFIG_NUMA=y
- -CONFIG_PREEMPT=y
- -CONFIG_KSM=y
- -CONFIG_MEMORY_FAILURE=y
- -CONFIG_TRANSPARENT_HUGEPAGE=y
- -CONFIG_CMA=y
   CONFIG_SECCOMP=y
   CONFIG_KEXEC=y
   CONFIG_CRASH_DUMP=y
   CONFIG_XEN=y
- -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
   CONFIG_COMPAT=y
   CONFIG_HIBERNATION=y
   CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
@@@ -107,39 -115,10 +107,39 @@@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=
   CONFIG_CPUFREQ_DT=y
   CONFIG_ACPI_CPPC_CPUFREQ=m
   CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
- -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
   CONFIG_ARM_SCPI_CPUFREQ=y
   CONFIG_ARM_TEGRA186_CPUFREQ=y
+ +CONFIG_ARM_SCPI_PROTOCOL=y
+ +CONFIG_RASPBERRYPI_FIRMWARE=y
   CONFIG_TI_SCI_PROTOCOL=y
+ +CONFIG_EFI_CAPSULE_LOADER=y
+ +CONFIG_ACPI=y
+ +CONFIG_ACPI_APEI=y
+ +CONFIG_ACPI_APEI_GHES=y
+ +CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+ +CONFIG_ACPI_APEI_EINJ=y
+ +CONFIG_VIRTUALIZATION=y
+ +CONFIG_KVM=y
+ +CONFIG_ARM64_CRYPTO=y
+ +CONFIG_CRYPTO_SHA1_ARM64_CE=y
+ +CONFIG_CRYPTO_SHA2_ARM64_CE=y
+ +CONFIG_CRYPTO_SHA512_ARM64_CE=m
+ +CONFIG_CRYPTO_SHA3_ARM64=m
+ +CONFIG_CRYPTO_SM3_ARM64_CE=m
+ +CONFIG_CRYPTO_GHASH_ARM64_CE=y
+ +CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
+ +CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+ +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+ +CONFIG_CRYPTO_CHACHA20_NEON=m
+ +CONFIG_CRYPTO_AES_ARM64_BS=m
+ +CONFIG_JUMP_LABEL=y
+ +CONFIG_MODULES=y
+ +CONFIG_MODULE_UNLOAD=y
+ +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+ +CONFIG_KSM=y
+ +CONFIG_MEMORY_FAILURE=y
+ +CONFIG_TRANSPARENT_HUGEPAGE=y
+ +CONFIG_CMA=y
   CONFIG_NET=y
   CONFIG_PACKET=y
   CONFIG_UNIX=y
@@@ -156,12 -135,14 +156,12 @@@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=
   CONFIG_NETFILTER_XT_TARGET_LOG=m
   CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
   CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
- -CONFIG_NF_CONNTRACK_IPV4=m
   CONFIG_IP_NF_IPTABLES=m
   CONFIG_IP_NF_FILTER=m
   CONFIG_IP_NF_TARGET_REJECT=m
   CONFIG_IP_NF_NAT=m
   CONFIG_IP_NF_TARGET_MASQUERADE=m
   CONFIG_IP_NF_MANGLE=m
- -CONFIG_NF_CONNTRACK_IPV6=m
   CONFIG_IP6_NF_IPTABLES=m
   CONFIG_IP6_NF_FILTER=m
   CONFIG_IP6_NF_TARGET_REJECT=m
@@@ -221,8 -202,8 +221,8 @@@ CONFIG_SCSI_HISI_SAS=
   CONFIG_SCSI_HISI_SAS_PCI=y
   CONFIG_SCSI_UFSHCD=m
   CONFIG_SCSI_UFSHCD_PLATFORM=m
- -CONFIG_SCSI_UFS_HISI=y
   CONFIG_SCSI_UFS_QCOM=m
+ +CONFIG_SCSI_UFS_HISI=m
   CONFIG_ATA=y
   CONFIG_SATA_AHCI=y
   CONFIG_SATA_AHCI_PLATFORM=y
@@@ -322,8 -303,6 +322,8 @@@ CONFIG_SERIAL_TEGRA=
   CONFIG_SERIAL_SH_SCI=y
   CONFIG_SERIAL_MSM=y
   CONFIG_SERIAL_MSM_CONSOLE=y
+ +CONFIG_SERIAL_QCOM_GENI=y
+ +CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
   CONFIG_SERIAL_XILINX_PS_UART=y
   CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
   CONFIG_SERIAL_MVEBU_UART=y
@@@ -369,12 -348,9 +369,12 @@@ CONFIG_PINCTRL_IPQ8074=
   CONFIG_PINCTRL_MSM8916=y
   CONFIG_PINCTRL_MSM8994=y
   CONFIG_PINCTRL_MSM8996=y
+ +CONFIG_PINCTRL_MSM8998=y
+ +CONFIG_PINCTRL_QCS404=y
   CONFIG_PINCTRL_QDF2XXX=y
   CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
- -CONFIG_PINCTRL_MT7622=y
+ +CONFIG_PINCTRL_SDM845=y
+ +CONFIG_PINCTRL_MTK_MOORE=y
   CONFIG_GPIO_DWAPB=y
   CONFIG_GPIO_MB86S7X=y
   CONFIG_GPIO_PL061=y
@@@ -395,14 -371,15 +395,15 @@@ CONFIG_BATTERY_SBS=
   CONFIG_BATTERY_BQ27XXX=y
   CONFIG_SENSORS_ARM_SCPI=y
   CONFIG_SENSORS_LM90=m
- -CONFIG_SENSORS_INA2XX=m
   CONFIG_SENSORS_RASPBERRYPI_HWMON=m
+ +CONFIG_SENSORS_INA2XX=m
   CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
   CONFIG_CPU_THERMAL=y
   CONFIG_THERMAL_EMULATION=y
   CONFIG_ROCKCHIP_THERMAL=m
   CONFIG_RCAR_GEN3_THERMAL=y
   CONFIG_ARMADA_THERMAL=y
+ CONFIG_BCM2835_THERMAL=m
   CONFIG_BRCMSTB_THERMAL=m
   CONFIG_EXYNOS_THERMAL=y
   CONFIG_TEGRA_BPMP_THERMAL=m
@@@ -417,9 -394,10 +418,9 @@@ CONFIG_RENESAS_WDT=
   CONFIG_UNIPHIER_WATCHDOG=y
   CONFIG_BCM2835_WDT=y
   CONFIG_MFD_BD9571MWV=y
+ +CONFIG_MFD_AXP20X_I2C=y
   CONFIG_MFD_AXP20X_RSB=y
   CONFIG_MFD_CROS_EC=y
- -CONFIG_CROS_EC_I2C=y
- -CONFIG_CROS_EC_SPI=y
   CONFIG_MFD_CROS_EC_CHARDEV=m
   CONFIG_MFD_EXYNOS_LPASS=m
   CONFIG_MFD_HI6421_PMIC=y
@@@ -437,7 -415,6 +438,7 @@@ CONFIG_REGULATOR_HI6421V530=
   CONFIG_REGULATOR_HI655X=y
   CONFIG_REGULATOR_MAX77620=y
   CONFIG_REGULATOR_PWM=y
+ +CONFIG_REGULATOR_QCOM_RPMH=y
   CONFIG_REGULATOR_QCOM_SMD_RPM=y
   CONFIG_REGULATOR_QCOM_SPMI=y
   CONFIG_REGULATOR_RK808=y
@@@ -454,9 -431,9 +455,9 @@@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=
   CONFIG_MEDIA_CONTROLLER=y
   CONFIG_VIDEO_V4L2_SUBDEV_API=y
   # CONFIG_DVB_NET is not set
- -CONFIG_V4L_MEM2MEM_DRIVERS=y
   CONFIG_MEDIA_USB_SUPPORT=y
   CONFIG_USB_VIDEO_CLASS=m
+ +CONFIG_V4L_MEM2MEM_DRIVERS=y
   CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
   CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
   CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
@@@ -472,6 -449,7 +473,6 @@@ CONFIG_DRM_EXYNOS_DSI=
   CONFIG_DRM_EXYNOS_HDMI=y
   CONFIG_DRM_EXYNOS_MIC=y
   CONFIG_DRM_ROCKCHIP=m
- -CONFIG_DRM_SUN4I=m
   CONFIG_ROCKCHIP_ANALOGIX_DP=y
   CONFIG_ROCKCHIP_CDN_DP=y
   CONFIG_ROCKCHIP_DW_HDMI=y
@@@ -479,9 -457,6 +480,9 @@@ CONFIG_ROCKCHIP_DW_MIPI_DSI=
   CONFIG_ROCKCHIP_INNO_HDMI=y
   CONFIG_DRM_RCAR_DU=m
   CONFIG_DRM_RCAR_LVDS=m
+ +CONFIG_DRM_SUN4I=m
+ +CONFIG_DRM_SUN8I_DW_HDMI=m
+ +CONFIG_DRM_SUN8I_MIXER=m
   CONFIG_DRM_TEGRA=m
   CONFIG_DRM_PANEL_SIMPLE=m
   CONFIG_DRM_I2C_ADV7511=m
@@@ -502,12 -477,19 +503,12 @@@ CONFIG_SND=
   CONFIG_SND_SOC=y
   CONFIG_SND_BCM2835_SOC_I2S=m
   CONFIG_SND_SOC_ROCKCHIP=m
- -CONFIG_SND_SOC_ROCKCHIP_I2S=m
   CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
   CONFIG_SND_SOC_ROCKCHIP_RT5645=m
   CONFIG_SND_SOC_RK3399_GRU_SOUND=m
   CONFIG_SND_SOC_SAMSUNG=y
   CONFIG_SND_SOC_RCAR=m
   CONFIG_SND_SOC_AK4613=m
- -CONFIG_SND_SOC_DA7219=m
- -CONFIG_SND_SOC_MAX98357A=m
- -CONFIG_SND_SOC_RL6231=m
- -CONFIG_SND_SOC_RT5514=m
- -CONFIG_SND_SOC_RT5514_SPI=m
- -CONFIG_SND_SOC_RT5645=m
   CONFIG_SND_SIMPLE_CARD=m
   CONFIG_SND_AUDIO_GRAPH_CARD=m
   CONFIG_I2C_HID=m
@@@ -530,6 -512,7 +531,6 @@@ CONFIG_USB_DWC2=
   CONFIG_USB_CHIPIDEA=y
   CONFIG_USB_CHIPIDEA_UDC=y
   CONFIG_USB_CHIPIDEA_HOST=y
- -CONFIG_USB_CHIPIDEA_ULPI=y
   CONFIG_USB_ISP1760=y
   CONFIG_USB_HSIC_USB3503=y
   CONFIG_NOP_USB_XCEIV=y
@@@ -537,6 -520,7 +538,6 @@@ CONFIG_USB_ULPI=
   CONFIG_USB_GADGET=y
   CONFIG_USB_RENESAS_USBHS_UDC=m
   CONFIG_USB_RENESAS_USB3=m
- -CONFIG_USB_ULPI_BUS=y
   CONFIG_MMC=y
   CONFIG_MMC_BLOCK_MINORS=32
   CONFIG_MMC_ARMMMCI=y
@@@ -604,8 -588,6 +605,8 @@@ CONFIG_VIRTIO_BALLOON=
   CONFIG_VIRTIO_MMIO=y
   CONFIG_XEN_GNTDEV=y
   CONFIG_XEN_GRANT_DEV_ALLOC=y
+ +CONFIG_CROS_EC_I2C=y
+ +CONFIG_CROS_EC_SPI=y
   CONFIG_COMMON_CLK_RK808=y
   CONFIG_COMMON_CLK_SCPI=y
   CONFIG_COMMON_CLK_CS2000_CP=y
@@@ -615,14 -597,10 +616,14 @@@ CONFIG_COMMON_CLK_PWM=
   CONFIG_TI_SCI_CLK=y
   CONFIG_COMMON_CLK_QCOM=y
   CONFIG_QCOM_CLK_SMD_RPM=y
+ +CONFIG_QCOM_CLK_RPMH=y
   CONFIG_IPQ_GCC_8074=y
   CONFIG_MSM_GCC_8916=y
   CONFIG_MSM_GCC_8994=y
   CONFIG_MSM_MMCC_8996=y
+ +CONFIG_MSM_GCC_8998=y
+ +CONFIG_QCS_GCC_404=y
+ +CONFIG_SDM_GCC_845=y
   CONFIG_HWSPINLOCK=y
   CONFIG_HWSPINLOCK_QCOM=y
   CONFIG_ARM_MHU=y
@@@ -635,18 -613,9 +636,18 @@@ CONFIG_TEGRA_IOMMU_SMMU=
   CONFIG_ARM_SMMU=y
   CONFIG_ARM_SMMU_V3=y
   CONFIG_QCOM_IOMMU=y
+ +CONFIG_REMOTEPROC=m
+ +CONFIG_QCOM_Q6V5_MSS=m
+ +CONFIG_QCOM_Q6V5_PAS=m
+ +CONFIG_QCOM_SYSMON=m
   CONFIG_RPMSG_QCOM_GLINK_RPM=y
+ +CONFIG_RPMSG_QCOM_GLINK_SMEM=m
   CONFIG_RPMSG_QCOM_SMD=y
   CONFIG_RASPBERRYPI_POWER=y
+ +CONFIG_QCOM_COMMAND_DB=y
+ +CONFIG_QCOM_GENI_SE=y
+ +CONFIG_QCOM_GLINK_SSR=m
+ +CONFIG_QCOM_RPMH=y
   CONFIG_QCOM_SMEM=y
   CONFIG_QCOM_SMD_RPM=y
   CONFIG_QCOM_SMP2P=y
@@@ -677,7 -646,6 +678,7 @@@ CONFIG_PWM_MESON=
   CONFIG_PWM_RCAR=m
   CONFIG_PWM_ROCKCHIP=y
   CONFIG_PWM_SAMSUNG=y
+ +CONFIG_PWM_SUN4I=m
   CONFIG_PWM_TEGRA=m
   CONFIG_RESET_TI_SCI=y
   CONFIG_PHY_XGENE=y
@@@ -695,9 -663,9 +696,9 @@@ CONFIG_PHY_ROCKCHIP_INNO_HDMI=
   CONFIG_PHY_ROCKCHIP_INNO_USB2=y
   CONFIG_PHY_ROCKCHIP_PCIE=m
   CONFIG_PHY_ROCKCHIP_TYPEC=y
- -CONFIG_PHY_TEGRA_XUSB=y
- -CONFIG_PHY_UNIPHIER_USB3=y
   CONFIG_PHY_UNIPHIER_USB2=y
+ +CONFIG_PHY_UNIPHIER_USB3=y
+ +CONFIG_PHY_TEGRA_XUSB=y
   CONFIG_HISI_PMU=y
   CONFIG_QCOM_L2_PMU=y
   CONFIG_QCOM_L3_PMU=y
@@@ -707,6 -675,14 +708,6 @@@ CONFIG_UNIPHIER_EFUSE=
   CONFIG_MESON_EFUSE=m
   CONFIG_TEE=y
   CONFIG_OPTEE=y
- -CONFIG_ARM_SCPI_PROTOCOL=y
- -CONFIG_RASPBERRYPI_FIRMWARE=y
- -CONFIG_EFI_CAPSULE_LOADER=y
- -CONFIG_ACPI=y
- -CONFIG_ACPI_APEI=y
- -CONFIG_ACPI_APEI_GHES=y
- -CONFIG_ACPI_APEI_MEMORY_FAILURE=y
- -CONFIG_ACPI_APEI_EINJ=y
   CONFIG_EXT2_FS=y
   CONFIG_EXT3_FS=y
   CONFIG_EXT4_FS_POSIX_ACL=y
@@@ -732,9 -708,8 +733,9 @@@ CONFIG_ROOT_NFS=
   CONFIG_9P_FS=y
   CONFIG_NLS_CODEPAGE_437=y
   CONFIG_NLS_ISO8859_1=y
- -CONFIG_VIRTUALIZATION=y
- -CONFIG_KVM=y
+ +CONFIG_SECURITY=y
+ +CONFIG_CRYPTO_ECHAINIV=y
+ +CONFIG_CRYPTO_ANSI_CPRNG=y
   CONFIG_PRINTK_TIME=y
   CONFIG_DEBUG_INFO=y
   CONFIG_DEBUG_FS=y
@@@ -744,3 -719,19 +745,3 @@@ CONFIG_DEBUG_KERNEL=
   # CONFIG_DEBUG_PREEMPT is not set
   # CONFIG_FTRACE is not set
   CONFIG_MEMTEST=y
- -CONFIG_SECURITY=y
- -CONFIG_CRYPTO_ECHAINIV=y
- -CONFIG_CRYPTO_ANSI_CPRNG=y
- -CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y
- -CONFIG_ARM64_CRYPTO=y
- -CONFIG_CRYPTO_SHA1_ARM64_CE=y
- -CONFIG_CRYPTO_SHA2_ARM64_CE=y
- -CONFIG_CRYPTO_SHA512_ARM64_CE=m
- -CONFIG_CRYPTO_SHA3_ARM64=m
- -CONFIG_CRYPTO_SM3_ARM64_CE=m
- -CONFIG_CRYPTO_GHASH_ARM64_CE=y
- -CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
- -CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
- -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
- -CONFIG_CRYPTO_CHACHA20_NEON=m
- -CONFIG_CRYPTO_AES_ARM64_BS=m
author	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 5 Jan 2019 19:30:37 +0000 (11:30 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 5 Jan 2019 19:30:37 +0000 (11:30 -0800)
		1	2
Documentation/admin-guide/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/vendor-prefixes.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/multi_v7_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig.platforms	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/configs/defconfig	patch \|	diff1 \|	diff2 \|	blob \| history