]> Git Repo - linux.git/commitdiff
Merge tag 'tag-chrome-platform-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Tue, 12 Mar 2019 16:46:32 +0000 (09:46 -0700)
committerLinus Torvalds <[email protected]>
Tue, 12 Mar 2019 16:46:32 +0000 (09:46 -0700)
Pull chrome platform updates from Benson Leung:

 - SPDX identifier cleanup for platform/chrome

 - Cleanup series between mfd and chrome/platform, moving cros-ec
   attributes from mfd/cros_ec_dev to sub-drivers in platform/chrome

 - Wilco EC driver

 - Maintainership change to new group repository

* tag 'tag-chrome-platform-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: fix wilco-ec dependencies
  platform/chrome: wilco_ec: Add RTC driver
  platform/chrome: wilco_ec: Add support for raw commands in debugfs
  platform/chrome: Add new driver for Wilco EC
  platform/chrome: cros_ec: Remove cros_ec dependency in lpc_mec
  MAINTAINERS: chrome-platform: change the git tree to a chrome-platform group git tree
  platform/chrome: cros_ec_sysfs: remove pr_fmt() define
  platform/chrome: cros_ec_lightbar: remove pr_fmt() define
  platform/chrome: cros_kbd_led_backlight: switch to SPDX identifier
  platform/chrome: cros_ec_spi: switch to SPDX identifier
  platform/chrome: cros_ec_proto: switch to SPDX identifier
  platform/chrome: cros_ec_lpc: switch to SPDX identifier
  platform/chrome: cros_ec_i2c: switch to SPDX identifier
  platform/chrome: cros_ec_vbc: switch to SPDX identifier
  platform/chrome: cros_ec_sysfs: switch to SPDX identifier
  platform/chrome: cros_ec_lightbar: switch to SPDX identifier
  platform/chrome: cros_ec_debugfs: switch to SPDX identifier
  platform/chrome: cromeos_pstore: switch to SPDX identifier

1  2 
MAINTAINERS
drivers/rtc/Kconfig
drivers/rtc/Makefile

diff --combined MAINTAINERS
index e2ec45968a1643d1a8e977caa21879fdd8d4c46a,a3c8b094228c4db87ac1f561c17f0a2793186a8d..4f004dc0a0f21ef2a9babf48e1f3e0d108df1b48
@@@ -331,7 -331,6 +331,7 @@@ ACPI APE
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
  L:    [email protected]
 +R:    James Morse <[email protected]>
  R:    Tony Luck <[email protected]>
  R:    Borislav Petkov <[email protected]>
  F:    drivers/acpi/apei/
@@@ -366,7 -365,6 +366,7 @@@ M: Lorenzo Pieralisi <lorenzo.pieralisi
  M:    Hanjun Guo <[email protected]>
  M:    Sudeep Holla <[email protected]>
  L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/acpi/arm64
  
@@@ -411,7 -409,8 +411,7 @@@ F: drivers/platform/x86/wmi.
  F:    include/uapi/linux/wmi.h
  
  AD1889 ALSA SOUND DRIVER
 -M:    Thibaut Varene <[email protected]>
 -W:    http://wiki.parisc-linux.org/AD1889
 +W:    https://parisc.wiki.kernel.org/index.php/AD1889
  L:    [email protected]
  S:    Maintained
  F:    sound/pci/ad1889.*
@@@ -767,13 -766,6 +767,13 @@@ S:       Supporte
  F:    Documentation/hwmon/fam15h_power
  F:    drivers/hwmon/fam15h_power.c
  
 +AMD FCH GPIO DRIVER
 +M:    Enrico Weigelt, metux IT consult <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-amd-fch.c
 +F:    include/linux/platform_data/gpio/gpio-amd-fch.h
 +
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  L:    [email protected] (moderated for non-subscribers)
  S:    Orphan
@@@ -862,22 -854,6 +862,22 @@@ S:       Supporte
  F:    drivers/iio/adc/ad7124.c
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
  
 +ANALOG DEVICES INC AD7606 DRIVER
 +M:    Stefan Popa <[email protected]>
 +L:    [email protected]
 +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
 +
 +ANALOG DEVICES INC AD7768-1 DRIVER
 +M:    Stefan Popa <[email protected]>
 +L:    [email protected]
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/adc/ad7768-1.c
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
 +
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Odd fixes
  F:    drivers/net/appletalk/
  F:    net/appletalk/
 +F:    include/linux/atalk.h
 +F:    include/uapi/linux/atalk.h
  
  APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT
 -M:    Duc Dang <dhdang@apm.com>
 +M:    Khuong Dinh <[email protected].com>
  S:    Supported
  F:    arch/arm64/boot/dts/apm/
  
  APPLIED MICRO (APM) X-GENE SOC EDAC
 -M:    Loc Ho <lho@apm.com>
 +M:    Khuong Dinh <[email protected].com>
  S:    Supported
  F:    drivers/edac/xgene_edac.c
  F:    Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
  
  APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER
 -M:    Iyappan Subramanian <isubramanian@apm.com>
 -M:    Keyur Chudgar <kchudgar@apm.com>
 +M:    Iyappan Subramanian <i[email protected].com>
 +M:    Keyur Chudgar <k[email protected].com>
  S:    Supported
  F:    drivers/net/ethernet/apm/xgene-v2/
  
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
 -M:    Iyappan Subramanian <isubramanian@apm.com>
 -M:    Keyur Chudgar <kchudgar@apm.com>
 -M:    Quan Nguyen <qnguyen@apm.com>
 +M:    Iyappan Subramanian <i[email protected].com>
 +M:    Keyur Chudgar <k[email protected].com>
 +M:    Quan Nguyen <q[email protected].com>
  S:    Supported
  F:    drivers/net/ethernet/apm/xgene/
  F:    drivers/net/phy/mdio-xgene.c
@@@ -1090,7 -1064,7 +1090,7 @@@ F:      Documentation/devicetree/bindings/ne
  F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
  
  APPLIED MICRO (APM) X-GENE SOC PMU
 -M:    Tai Nguyen <ttnguyen@apm.com>
 +M:    Khuong Dinh <[email protected].com>
  S:    Supported
  F:    drivers/perf/xgene_pmu.c
  F:    Documentation/perf/xgene-pmu.txt
@@@ -1159,26 -1133,13 +1159,26 @@@ S:   Supporte
  F:    drivers/gpu/drm/arm/hdlcd_*
  F:    Documentation/devicetree/bindings/display/arm,hdlcd.txt
  
 +ARM KOMEDA DRM-KMS DRIVER
 +M:    James (Qian) Wang <[email protected]>
 +M:    Liviu Dudau <[email protected]>
 +L:    Mali DP Maintainers <[email protected]>
 +S:    Supported
 +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/gpu/komeda-kms.rst
 +
  ARM MALI-DP DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  M:    Brian Starkey <[email protected]>
 -M:    Mali DP Maintainers <[email protected]>
 +L:    Mali DP Maintainers <[email protected]>
  S:    Supported
 +T:    git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
  F:    drivers/gpu/drm/arm/
  F:    Documentation/devicetree/bindings/display/arm,malidp.txt
 +F:    Documentation/gpu/afbc.rst
  
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <[email protected]>
@@@ -1198,7 -1159,7 +1198,7 @@@ F:      arch/arm*/include/asm/hw_breakpoint.
  F:    arch/arm*/include/asm/perf_event.h
  F:    drivers/perf/*
  F:    include/linux/perf/arm_pmu.h
 -F:    Documentation/devicetree/bindings/arm/pmu.txt
 +F:    Documentation/devicetree/bindings/arm/pmu.yaml
  F:    Documentation/devicetree/bindings/perf/
  
  ARM PORT
@@@ -1411,13 -1372,6 +1411,13 @@@ F:    arch/arm/mach-aspeed
  F:    arch/arm/boot/dts/aspeed-*
  N:    aspeed
  
 +ARM/BITMAIN ARCHITECTURE
 +M:    Manivannan Sadhasivam <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/boot/dts/bitmain/
 +F:    Documentation/devicetree/bindings/arm/bitmain.yaml
 +
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1577,14 -1531,21 +1577,14 @@@ ARM/FREESCALE IMX / MXC ARM ARCHITECTUR
  M:    Shawn Guo <[email protected]>
  M:    Sascha Hauer <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
 -R:    Fabio Estevam <fabio.estevam@nxp.com>
 +R:    Fabio Estevam <festevam@gmail.com>
  R:    NXP Linux Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 -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/
 -F:    include/linux/firmware/imx/
 -F:    include/soc/imx/
 +N:    imx
 +N:    mxs
 +X:    drivers/media/i2c/
  
  ARM/FREESCALE VYBRID ARM ARCHITECTURE
  M:    Shawn Guo <[email protected]>
@@@ -1776,7 -1737,6 +1776,7 @@@ F:      arch/arm/configs/mvebu_*_defconfi
  F:    arch/arm/mach-mvebu/
  F:    arch/arm64/boot/dts/marvell/armada*
  F:    drivers/cpufreq/armada-37xx-cpufreq.c
 +F:    drivers/cpufreq/armada-8k-cpufreq.c
  F:    drivers/cpufreq/mvebu-cpufreq.c
  F:    drivers/irqchip/irq-armada-370-xp.c
  F:    drivers/irqchip/irq-mvebu-*
@@@ -1922,11 -1882,10 +1922,11 @@@ F:   drivers/usb/host/ehci-w90x900.
  F:    drivers/video/fbdev/nuc900fb.c
  
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 -M:    Nelson Castillo <[email protected]>
  L:    [email protected] (subscribers-only)
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
 -S:    Supported
 +S:    Orphan
 +F:    arch/arm/mach-s3c24xx/mach-gta02.c
 +F:    arch/arm/mach-s3c24xx/gta02.h
  
  ARM/Orion SoC/Technologic Systems TS-78xx platform support
  M:    Alexander Clouter <[email protected]>
@@@ -1989,37 -1948,19 +1989,37 @@@ M:   David Brown <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/qcom/
 +F:    Documentation/devicetree/bindings/*/qcom*
  F:    arch/arm/boot/dts/qcom-*.dts
  F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
 -F:    arch/arm64/boot/dts/qcom/*
 +F:    arch/arm64/boot/dts/qcom/
 +F:    drivers/*/qcom/
 +F:    drivers/*/qcom*
 +F:    drivers/*/*/qcom/
 +F:    drivers/*/*/qcom*
 +F:    drivers/*/pm8???-*
 +F:    drivers/bluetooth/btqcomsmd.c
 +F:    drivers/clocksource/timer-qcom.c
 +F:    drivers/extcon/extcon-qcom*
 +F:    drivers/iommu/msm*
  F:    drivers/i2c/busses/i2c-qup.c
 -F:    drivers/clk/qcom/
 -F:    drivers/dma/qcom/
 -F:    drivers/soc/qcom/
 +F:    drivers/i2c/busses/i2c-qcom-geni.c
 +F:    drivers/mfd/ssbi.c
 +F:    drivers/mmc/host/mmci_qcom*
 +F:    drivers/mmc/host/sdhci_msm.c
 +F:    drivers/pci/controller/dwc/pcie-qcom.c
 +F:    drivers/phy/qualcomm/
 +F:    drivers/power/*/msm*
 +F:    drivers/reset/reset-qcom-*
 +F:    drivers/scsi/ufs/ufs-qcom.*
  F:    drivers/spi/spi-qup.c
 +F:    drivers/spi/spi-geni-qcom.c
 +F:    drivers/spi/spi-qcom-qspi.c
  F:    drivers/tty/serial/msm_serial.c
 -F:    drivers/*/pm8???-*
 -F:    drivers/mfd/ssbi.c
 -F:    drivers/firmware/qcom_scm*
 +F:    drivers/usb/dwc3/dwc3-qcom.c
 +F:    include/dt-bindings/*/qcom*
 +F:    include/linux/*/qcom*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
@@@ -2056,7 -1997,7 +2056,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm64/boot/dts/renesas/
 -F:    Documentation/devicetree/bindings/arm/shmobile.txt
 +F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  
@@@ -2143,9 -2084,8 +2143,9 @@@ F:      drivers/media/platform/s5p-cec
  F:    Documentation/devicetree/bindings/media/s5p-cec.txt
  
  ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
 -M:    Andrzej Pietrasiewicz <andrzej.p@samsung.com>
 +M:    Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
  M:    Jacek Anaszewski <[email protected]>
 +M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -2169,8 -2109,6 +2169,8 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm/boot/dts/emev2*
 +F:    arch/arm/boot/dts/gr-peach*
 +F:    arch/arm/boot/dts/iwg20d-q7*
  F:    arch/arm/boot/dts/r7s*
  F:    arch/arm/boot/dts/r8a*
  F:    arch/arm/boot/dts/r9a*
@@@ -2178,7 -2116,7 +2178,7 @@@ F:      arch/arm/boot/dts/sh
  F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/include/debug/renesas-scif.S
  F:    arch/arm/mach-shmobile/
 -F:    Documentation/devicetree/bindings/arm/shmobile.txt
 +F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  
@@@ -2565,6 -2503,7 +2565,6 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/devicetree/bindings/eeprom/at24.txt
  F:    drivers/misc/eeprom/at24.c
 -F:    include/linux/platform_data/at24.h
  
  ATA OVER ETHERNET (AOE) DRIVER
  M:    "Ed L. Cashin" <[email protected]>
@@@ -2670,7 -2609,6 +2670,7 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/*/include/asm/atomic*.h
  F:    include/*/atomic*.h
 +F:    scripts/atomic/
  
  ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
  M:    Bradley Grove <[email protected]>
@@@ -2910,11 -2848,8 +2910,11 @@@ F:    include/uapi/linux/if_bonding.
  BPF (Safe dynamic programs and tools)
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
 +R:    Martin KaFai Lau <[email protected]>
 +R:    Song Liu <[email protected]>
 +R:    Yonghong Song <[email protected]>
  L:    [email protected]
 -L:    linux-kernel@vger.kernel.org
 +L:    bpf@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
  Q:    https://patchwork.ozlabs.org/project/netdev/list/?delegate=77147
@@@ -2938,13 -2873,10 +2938,13 @@@ F:   samples/bpf
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
 +K:    bpf
 +N:    bpf
  
  BPF JIT for ARM
  M:    Shubham Bansal <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/arm/net/
  
@@@ -2953,21 -2885,18 +2953,21 @@@ M:   Daniel Borkmann <[email protected]
  M:    Alexei Starovoitov <[email protected]>
  M:    Zi Shen Lim <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    arch/arm64/net/
  
  BPF JIT for MIPS (32-BIT AND 64-BIT)
  M:    Paul Burton <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/mips/net/
  
  BPF JIT for NFP NICs
  M:    Jakub Kicinski <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/netronome/nfp/bpf/
  
@@@ -2975,21 -2904,13 +2975,21 @@@ BPF JIT for POWERPC (32-BIT AND 64-BIT
  M:    Naveen N. Rao <[email protected]>
  M:    Sandipan Das <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/powerpc/net/
  
 +BPF JIT for RISC-V (RV64G)
 +M:    Björn Töpel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/riscv/net/
 +
  BPF JIT for S390
  M:    Martin Schwidefsky <[email protected]>
  M:    Heiko Carstens <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/s390/net/
  X:    arch/s390/net/pnet.c
  BPF JIT for SPARC (32-BIT AND 64-BIT)
  M:    David S. Miller <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/sparc/net/
  
  BPF JIT for X86 32-BIT
  M:    Wang YanQing <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/x86/net/bpf_jit_comp32.c
  
@@@ -3012,7 -2931,6 +3012,7 @@@ BPF JIT for X86 64-BI
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    arch/x86/net/
  X:    arch/x86/net/bpf_jit_comp32.c
@@@ -3134,8 -3052,8 +3134,8 @@@ F:      include/linux/bcm963xx_nvram.
  F:    include/linux/bcm963xx_tag.h
  
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 -M:    Rasesh Mody <rasesh.mody@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Rasesh Mody <rmody@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2.*
@@@ -3154,9 -3072,9 +3154,9 @@@ S:      Supporte
  F:    drivers/scsi/bnx2i/
  
  BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 -M:    Ariel Elior <ariel.elior@cavium.com>
 -M:    Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
 -M:    everest-linux-l2@cavium.com
 +M:    Ariel Elior <aelior@marvell.com>
 +M:    Sudarsana Kalluru <skalluru@marvell.com>
 +M:    GR-everest-linux-l2@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2x/
@@@ -3331,9 -3249,9 +3331,9 @@@ S:      Supporte
  F:    drivers/scsi/bfa/
  
  BROCADE BNA 10 GIGABIT ETHERNET DRIVER
 -M:    Rasesh Mody <rasesh.mody@cavium.com>
 -M:    Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Rasesh Mody <rmody@marvell.com>
 +M:    Sudarsana Kalluru <skalluru@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/brocade/bna/
@@@ -3467,8 -3385,9 +3467,8 @@@ F:      Documentation/media/v4l-drivers/cafe
  F:    drivers/media/platform/marvell-ccic/
  
  CAIF NETWORK LAYER
 -M:    Dmitry Tarnyagin <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Orphan
  F:    Documentation/networking/caif/
  F:    drivers/net/caif/
  F:    include/uapi/linux/caif/
@@@ -3592,6 -3511,7 +3592,6 @@@ F:      include/linux/spi/cc2520.
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
  CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
 -M:    Yael Chemla <[email protected]>
  M:    Gilad Ben-Yossef <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -3755,7 -3675,7 +3755,7 @@@ CHROME HARDWARE PLATFORM SUPPOR
  M:    Benson Leung <[email protected]>
  M:    Enric Balletbo i Serra <[email protected]>
  S:    Maintained
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
  F:    drivers/platform/chrome/
  
  CHROMEOS EC SUBDRIVERS
@@@ -3767,14 -3687,6 +3767,14 @@@ N:    cros_e
  N:    cros-ec
  F:    drivers/power/supply/cros_usbpd-charger.c
  
 +CHROMEOS EC CODEC DRIVER
 +M:    Cheng-Yi Chiang <[email protected]>
 +S:    Maintained
 +R:    Enric Balletbo i Serra <[email protected]>
 +R:    Guenter Roeck <[email protected]>
 +F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
 +F:    sound/soc/codecs/cros_ec_codec.*
 +
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    Brian Austin <[email protected]>
  M:    Paul Handrigan <[email protected]>
  S:    Maintained
  F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
  
 +CIRRUS LOGIC LOCHNAGAR DRIVER
 +M:    Charles Keepax <[email protected]>
 +M:    Richard Fitzgerald <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/clk/clk-lochnagar.c
 +F:    drivers/mfd/lochnagar-i2c.c
 +F:    drivers/pinctrl/cirrus/pinctrl-lochnagar.c
 +F:    drivers/regulator/lochnagar-regulator.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/pinctrl/cirrus,lochnagar.txt
 +F:    Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
 +
  CISCO FCOE HBA DRIVER
  M:    Satish Kharat <[email protected]>
  M:    Sesidhar Baddela <[email protected]>
@@@ -4011,10 -3906,9 +4011,10 @@@ M:    Johannes Weiner <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
 -F:    Documentation/cgroup*
 +F:    Documentation/admin-guide/cgroup-v2.rst
 +F:    Documentation/cgroup-v1/
  F:    include/linux/cgroup*
 -F:    kernel/cgroup*
 +F:    kernel/cgroup/
  
  CONTROL GROUP - CPUSET
  M:    Li Zefan <[email protected]>
@@@ -4062,7 -3956,7 +4062,7 @@@ M:      Viresh Kumar <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 -T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git (For ARM Updates)
  B:    https://bugzilla.kernel.org
  F:    Documentation/admin-guide/pm/cpufreq.rst
  F:    Documentation/admin-guide/pm/intel_pstate.rst
@@@ -4084,7 -3978,6 +4084,7 @@@ F:      drivers/cpufreq/arm_big_little.
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <[email protected]>
  M:    Shuah Khan <[email protected]>
 +M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    tools/power/cpupower/
@@@ -4122,7 -4015,6 +4122,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  B:    https://bugzilla.kernel.org
  F:    Documentation/admin-guide/pm/cpuidle.rst
 +F:    Documentation/driver-api/pm/cpuidle.rst
  F:    drivers/cpuidle/*
  F:    include/linux/cpuidle.h
  
@@@ -4230,7 -4122,7 +4230,7 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/cxd2820r*
  
  CXGB3 ETHERNET DRIVER (CXGB3)
 -M:    Arjun Vynipadath <arjun@chelsio.com>
 +M:    Vishal Kulkarni <vishal@chelsio.com>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4259,7 -4151,7 +4259,7 @@@ S:      Supporte
  F:    drivers/crypto/chelsio
  
  CXGB4 ETHERNET DRIVER (CXGB4)
 -M:    Arjun Vynipadath <arjun@chelsio.com>
 +M:    Vishal Kulkarni <vishal@chelsio.com>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4940,11 -4832,10 +4940,11 @@@ F:   Documentation/devicetree/bindings/di
  
  DRM DRIVER FOR MSM ADRENO GPU
  M:    Rob Clark <[email protected]>
 +M:    Sean Paul <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
 -T:    git git://people.freedesktop.org/~robclark/linux
 +T:    git https://gitlab.freedesktop.org/drm/msm.git
  S:    Maintained
  F:    drivers/gpu/drm/msm/
  F:    include/uapi/drm/msm_drm.h
@@@ -4984,7 -4875,6 +4984,7 @@@ DRM DRIVER FOR QXL VIRTUAL GP
  M:    Dave Airlie <[email protected]>
  M:    Gerd Hoffmann <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/qxl/
@@@ -5005,12 -4895,6 +5005,12 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/sis/
  F:    include/uapi/drm/sis_drm.h
  
 +DRM DRIVER FOR SITRONIX ST7701 PANELS
 +M:    Jagan Teki <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-sitronix-st7701.c
 +F:    Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
 +
  DRM DRIVER FOR SITRONIX ST7586 PANELS
  M:    David Lechner <[email protected]>
  S:    Maintained
@@@ -5027,13 -4911,6 +5027,13 @@@ DRM DRIVER FOR TDFX VIDEO CARD
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
  
 +DRM DRIVER FOR TPO TPG110 PANELS
 +M:    Linus Walleij <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-tpo-tpg110.c
 +F:    Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt
 +
  DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
  M:    Dave Airlie <[email protected]>
  R:    Sean Paul <[email protected]>
@@@ -5042,16 -4919,6 +5042,16 @@@ S:    Odd Fixe
  F:    drivers/gpu/drm/udl/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 +DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
 +M:    Rodrigo Siqueira <[email protected]>
 +R:    Haneen Mohammed <[email protected]>
 +R:    Daniel Vetter <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +L:    [email protected]
 +F:    drivers/gpu/drm/vkms/
 +F:    Documentation/gpu/vkms.rst
 +
  DRM DRIVER FOR VMWARE VIRTUAL GPU
  M:    "VMware Graphics" <[email protected]>
  M:    Thomas Hellstrom <[email protected]>
@@@ -5121,6 -4988,7 +5121,6 @@@ F:      Documentation/devicetree/bindings/di
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR BRIDGE CHIPS
 -M:    Archit Taneja <[email protected]>
  M:    Andrzej Hajda <[email protected]>
  R:    Laurent Pinchart <[email protected]>
  S:    Maintained
@@@ -5312,7 -5180,7 +5312,7 @@@ DRM DRIVERS FOR XE
  M:    Oleksandr Andrushchenko <[email protected]>
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  L:    [email protected]
 -L:    [email protected].org
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/gpu/drm/xen/
  F:    Documentation/gpu/xen-front.rst
  S:    Maintained
  F:    drivers/edac/amd64_edac*
  
 +EDAC-AST2500
 +M:    Stefan Schaeckeler <[email protected]>
 +S:    Supported
 +F:    drivers/edac/aspeed_edac.c
 +F:    Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
 +
  EDAC-CALXEDA
  M:    Robert Richter <[email protected]>
  L:    [email protected]
@@@ -5560,7 -5422,6 +5560,7 @@@ F:      drivers/edac/thunderx_edac
  EDAC-CORE
  M:    Borislav Petkov <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
 +R:    James Morse <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@@ -5993,7 -5854,7 +5993,7 @@@ S:      Maintaine
  F:    drivers/media/tuners/fc2580*
  
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
 -M:    Johannes Thumshirn <[email protected]>
 +M:    Hannes Reinecke <[email protected]>
  L:    [email protected]
  W:    www.Open-FCoE.org
  S:    Supported
@@@ -6020,7 -5881,6 +6020,7 @@@ L:      [email protected]
  S:    Maintained
  F:    fs/*
  F:    include/linux/fs.h
 +F:    include/linux/fs_types.h
  F:    include/uapi/linux/fs.h
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
 +FREESCALE ENETC ETHERNET DRIVERS
 +M:    Claudiu Manoil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/freescale/enetc/
 +
  FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
  M:    Claudiu Manoil <[email protected]>
  L:    [email protected]
@@@ -6232,17 -6086,15 +6232,17 @@@ FREESCALE QORIQ PTP CLOCK DRIVE
  M:    Yangbo Lu <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    drivers/net/ethernet/freescale/enetc/enetc_ptp.c
  F:    drivers/ptp/ptp_qoriq.c
 +F:    drivers/ptp/ptp_qoriq_debugfs.c
  F:    include/linux/fsl/ptp_qoriq.h
  F:    Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
  
  FREESCALE QUAD SPI DRIVER
  M:    Han Xu <[email protected]>
 -L:    linux-[email protected].org
 +L:    linux-[email protected].org
  S:    Maintained
 -F:    drivers/mtd/spi-nor/fsl-quadspi.c
 +F:    drivers/spi/spi-fsl-qspi.c
  
  FREESCALE QUICC ENGINE LIBRARY
  M:    Qiang Zhao <[email protected]>
@@@ -6293,7 -6145,7 +6293,7 @@@ FREESCALE SOC SOUND DRIVER
  M:    Timur Tabi <[email protected]>
  M:    Nicolin Chen <[email protected]>
  M:    Xiubo Li <[email protected]>
 -R:    Fabio Estevam <fabio.estevam@nxp.com>
 +R:    Fabio Estevam <festevam@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -6341,10 -6193,9 +6341,10 @@@ F:    include/linux/fscache*.
  FSCRYPT: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
  M:    Theodore Y. Ts'o <[email protected]>
  M:    Jaegeuk Kim <[email protected]>
 +M:    Eric Biggers <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-fscrypt/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git
 +T:    git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git
  S:    Supported
  F:    fs/crypto/
  F:    include/linux/fscrypt*.h
@@@ -6790,15 -6641,6 +6790,15 @@@ F:    drivers/clocksource/h8300_*.
  F:    drivers/clk/h8300/
  F:    drivers/irqchip/irq-renesas-h8*.c
  
 +HABANALABS PCI DRIVER
 +M:    Oded Gabbay <[email protected]>
 +T:    git https://github.com/HabanaAI/linux.git
 +S:    Supported
 +F:    drivers/misc/habanalabs/
 +F:    include/uapi/misc/habanalabs.h
 +F:    Documentation/ABI/testing/sysfs-driver-habanalabs
 +F:    Documentation/ABI/testing/debugfs-driver-habanalabs
 +
  HACKRF MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -7156,7 -6998,7 +7156,7 @@@ M:      Haiyang Zhang <[email protected]
  M:    Stephen Hemminger <[email protected]>
  M:    Sasha Levin <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
 -L:    devel@linuxdriverproject.org
 +L:    [email protected].org
  S:    Supported
  F:    Documentation/networking/device_drivers/microsoft/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
@@@ -7172,7 -7014,6 +7172,7 @@@ F:      drivers/net/hyperv
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
 +F:    drivers/iommu/hyperv_iommu.c
  F:    net/vmw_vsock/hyperv_transport.c
  F:    include/linux/hyperv.h
  F:    include/uapi/linux/hyperv.h
@@@ -7322,7 -7163,6 +7322,7 @@@ F:      drivers/i2c/i2c-stub.
  I3C SUBSYSTEM
  M:    Boris Brezillon <[email protected]>
  L:    [email protected]
 +C:    irc://chat.freenode.net/linux-i3c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-i3c
@@@ -7857,6 -7697,7 +7857,6 @@@ M:      Yong Zhi <[email protected]
  M:    Sakari Ailus <[email protected]>
  M:    Bingbu Cao <[email protected]>
  R:    Tian Shu Qiu <[email protected]>
 -R:    Jian Xu Zheng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/pci/intel/ipu3/
  S:    Maintained
  F:    drivers/gpio/gpio-intel-mid.c
  
 +INTERCONNECT API
 +M:    Georgi Djakov <[email protected]>
 +S:    Maintained
 +F:    Documentation/interconnect/
 +F:    Documentation/devicetree/bindings/interconnect/
 +F:    drivers/interconnect/
 +F:    include/dt-bindings/interconnect/
 +F:    include/linux/interconnect-provider.h
 +F:    include/linux/interconnect.h
 +
  INVENSENSE MPU-3050 GYROSCOPE DRIVER
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -8427,7 -8258,6 +8427,7 @@@ F:      include/uapi/linux/sunrpc
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <[email protected]>
 +M:    Shuah Khan <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
  Q:    https://patchwork.kernel.org/project/linux-kselftest/list/
@@@ -8569,7 -8399,7 +8569,7 @@@ F:      security/keys/encrypted-keys
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
  M:      Jarkko Sakkinen <[email protected]>
 -M:    Mimi Zohar <[email protected]>
 +M:    Mimi Zohar <zohar@linux.ibm.com>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -8650,7 -8480,6 +8650,7 @@@ L7 BPF FRAMEWOR
  M:    John Fastabend <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    include/linux/skmsg.h
  F:    net/core/skmsg.c
@@@ -9002,10 -8831,10 +9002,10 @@@ F:   drivers/platform/x86/hp_accel.
  
  LIVE PATCHING
  M:    Josh Poimboeuf <[email protected]>
 -M:    Jessica Yu <[email protected]>
  M:    Jiri Kosina <[email protected]>
  M:    Miroslav Benes <[email protected]>
 -R:    Petr Mladek <[email protected]>
 +M:    Petr Mladek <[email protected]>
 +R:    Joe Lawrence <[email protected]>
  S:    Maintained
  F:    kernel/livepatch/
  F:    include/linux/livepatch.h
@@@ -9014,9 -8843,8 +9014,9 @@@ F:      arch/x86/kernel/livepatch.
  F:    Documentation/livepatch/
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    samples/livepatch/
 +F:    tools/testing/selftests/livepatch/
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git
  
  LLC (802.2)
  L:    [email protected]
@@@ -9254,14 -9082,6 +9254,14 @@@ F:    drivers/gpu/drm/armada
  F:    include/uapi/drm/armada_drm.h
  F:    Documentation/devicetree/bindings/display/armada/
  
 +MARVELL ARMADA 3700 PHY DRIVERS
 +M:    Miquel Raynal <[email protected]>
 +S:    Maintained
 +F:    drivers/phy/marvell/phy-mvebu-a3700-comphy.c
 +F:    drivers/phy/marvell/phy-mvebu-a3700-utmi.c
 +F:    Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
 +F:    Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
 +
  MARVELL CRYPTO DRIVER
  M:    Boris Brezillon <[email protected]>
  M:    Arnaud Ebalard <[email protected]>
@@@ -9530,17 -9350,6 +9530,17 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/platform/imx-pxp.[ch]
  
 +MEDIA DRIVERS FOR FREESCALE IMX7
 +M:    Rui Miguel Silva <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/imx7-csi.txt
 +F:    Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
 +F:    Documentation/media/v4l-drivers/imx7.rst
 +F:    drivers/staging/media/imx/imx7-media-csi.c
 +F:    drivers/staging/media/imx/imx7-mipi-csis.c
 +
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <[email protected]>
  L:    [email protected]
@@@ -9902,7 -9711,6 +9902,7 @@@ M:      Vadim Pasternak <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/platform/mellanox/
 +F:    include/linux/platform_data/mlxreg.h
  
  MELLANOX MLX4 core VPI driver
  M:    Tariq Toukan <[email protected]>
@@@ -9977,14 -9785,6 +9977,14 @@@ F:    kernel/sched/membarrier.
  F:    include/uapi/linux/membarrier.h
  F:    arch/powerpc/include/asm/membarrier.h
  
 +MEMBLOCK
 +M:    Mike Rapoport <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    include/linux/memblock.h
 +F:    mm/memblock.c
 +F:    Documentation/core-api/boot-time-mm.rst
 +
  MEMORY MANAGEMENT
  L:    [email protected]
  W:    http://www.linux-mm.org
@@@ -10051,18 -9851,6 +10051,18 @@@ F:  drivers/media/platform/meson/ao-cec.
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
 +MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
 +M:    Liang Yang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mtd/nand/raw/meson_*
 +F:    Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
 +
 +METHODE UDPU SUPPORT
 +M:    Vladimir Vid <[email protected]>
 +S:    Maintained
 +F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
  W:    http://www.monstr.eu/fdt/
@@@ -10787,7 -10575,6 +10787,7 @@@ F:   Documentation/devicetree/bindings/ne
  F:    net/dsa/
  F:    include/net/dsa.h
  F:    include/linux/dsa/
 +F:    include/linux/platform_data/dsa.h
  F:    drivers/net/dsa/
  
  NETWORKING [GENERAL]
@@@ -10901,9 -10688,9 +10901,9 @@@ S:   Maintaine
  F:    drivers/net/netdevsim/*
  
  NETXEN (1/10) GbE SUPPORT
 -M:    Manish Chopra <manish.chopra@cavium.com>
 -M:    Rahul Verma <rahul.verma@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Manish Chopra <manishc@marvell.com>
 +M:    Rahul Verma <rahulv@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/netxen/
@@@ -11003,12 -10790,6 +11003,12 @@@ F: drivers/power/supply/bq27xxx_battery
  F:    drivers/power/supply/isp1704_charger.c
  F:    drivers/power/supply/rx51_battery.c
  
 +NOLIBC HEADER FILE
 +M:    Willy Tarreau <[email protected]>
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
 +F:    tools/include/nolibc/
 +
  NTB AMD DRIVER
  M:    Shyam Sundar S K <[email protected]>
  L:    [email protected]
@@@ -11110,7 -10891,7 +11110,7 @@@ F:   include/linux/nvmem-consumer.
  F:    include/linux/nvmem-provider.h
  
  NXP SGTL5000 DRIVER
 -M:    Fabio Estevam <fabio.estevam@nxp.com>
 +M:    Fabio Estevam <festevam@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
@@@ -11148,14 -10929,6 +11148,14 @@@ F: lib/objagg.
  F:    lib/test_objagg.c
  F:    include/linux/objagg.h
  
 +NXP FSPI DRIVER
 +R:    Yogesh Gaur <[email protected]>
 +M:    Ashish Kumar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/spi/spi-nxp-fspi.c
 +F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
 +
  OBJTOOL
  M:    Josh Poimboeuf <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -11457,19 -11230,6 +11457,19 @@@ S: Maintaine
  F:    drivers/media/i2c/ov7740.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
  
 +OMNIVISION OV9640 SENSOR DRIVER
 +M:    Petr Cvek <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/ov9640.*
 +
 +OMNIVISION OV8856 SENSOR DRIVER
 +M:    Ben Kao <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov8856.c
 +
  OMNIVISION OV9650 SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  R:    Akinobu Mita <[email protected]>
@@@ -11502,11 -11262,6 +11502,11 @@@ M: Jens Wiklander <jens.wiklander@linar
  S:    Maintained
  F:    drivers/tee/optee/
  
 +OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
 +M:    Sumit Garg <[email protected]>
 +S:    Maintained
 +F:    drivers/char/hw_random/optee-rng.c
 +
  OPA-VNIC DRIVER
  M:    Dennis Dalessandro <[email protected]>
  M:    Niranjana Vishwanathapura <[email protected]>
@@@ -11550,12 -11305,10 +11550,12 @@@ F:        include/dt-bindings
  
  OPENCORES I2C BUS DRIVER
  M:    Peter Korsgaard <[email protected]>
 +M:    Andrew Lunn <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/i2c/busses/i2c-ocores
  F:    drivers/i2c/busses/i2c-ocores.c
 +F:    include/linux/platform_data/i2c-ocores.h
  
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <[email protected]>
@@@ -11634,6 -11387,13 +11634,6 @@@ W:  http://www.nongnu.org/orinoco
  S:    Orphan
  F:    drivers/net/wireless/intersil/orinoco/
  
 -OSD LIBRARY and FILESYSTEM
 -M:    Boaz Harrosh <[email protected]>
 -S:    Maintained
 -F:    drivers/scsi/osd/
 -F:    include/scsi/osd_*
 -F:    fs/exofs/
 -
  OV2659 OMNIVISION SENSOR DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
@@@ -11719,7 -11479,7 +11719,7 @@@ F:   Documentation/blockdev/paride.tx
  F:    drivers/block/paride/
  
  PARISC ARCHITECTURE
 -M:    "James E.J. Bottomley" <[email protected]>
 +M:    "James E.J. Bottomley" <[email protected]>
  M:    Helge Deller <[email protected]>
  L:    [email protected]
  W:    http://www.parisc-linux.org/
@@@ -11746,11 -11506,6 +11746,11 @@@ F: lib/parman.
  F:    lib/test_parman.c
  F:    include/linux/parman.h
  
 +PC ENGINES APU BOARD DRIVER
 +M:    Enrico Weigelt, metux IT consult <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/x86/pcengines-apuv2.c
 +
  PC87360 HARDWARE MONITORING DRIVER
  M:    Jim Cromie <[email protected]>
  L:    [email protected]
@@@ -11804,7 -11559,7 +11804,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-altera.c
  
  PCI DRIVER FOR APPLIEDMICRO XGENE
 -M:    Tanmay Inamdar <tinamdar@apm.com>
 +M:    Toan Le <[email protected].com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -11828,7 -11583,7 +11828,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/pcie-armada8k.c
  
  PCI DRIVER FOR CADENCE PCIE IP
 -M:    Alan Douglas <adouglas@cadence.com>
 +M:    Tom Joseph <tjoseph@cadence.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/cdns,*.txt
@@@ -11982,7 -11737,7 +11982,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-altera-msi.c
  
  PCI MSI DRIVER FOR APPLIEDMICRO XGENE
 -M:    Duc Dang <dhdang@apm.com>
 +M:    Toan Le <[email protected].com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -12471,6 -12226,14 +12471,6 @@@ S:  Maintaine
  F:    drivers/net/ppp/pptp.c
  W:    http://sourceforge.net/projects/accel-pptp
  
 -PREEMPTIBLE KERNEL
 -M:    Robert Love <[email protected]>
 -L:    [email protected]
 -W:    https://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
 -S:    Supported
 -F:    Documentation/preempt-locking.txt
 -F:    include/linux/preempt.h
 -
  PRINTK
  M:    Petr Mladek <[email protected]>
  M:    Sergey Senozhatsky <[email protected]>
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd Fixes
  F:    drivers/media/usb/pwc/*
 +F:    include/trace/events/pwc.h
  
  PWM FAN DRIVER
  M:    Kamil Debski <[email protected]>
@@@ -12712,8 -12474,8 +12712,8 @@@ S:   Supporte
  F:    drivers/scsi/qedi/
  
  QLOGIC QL4xxx ETHERNET DRIVER
 -M:    Ariel Elior <Ariel.Elior@cavium.com>
 -M:    everest-linux-l2@cavium.com
 +M:    Ariel Elior <aelior@marvell.com>
 +M:    GR-everest-linux-l2@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qed/
@@@ -12721,8 -12483,8 +12721,8 @@@ F:   include/linux/qed
  F:    drivers/net/ethernet/qlogic/qede/
  
  QLOGIC QL4xxx RDMA DRIVER
 -M:    Michal Kalderon <Michal.Kalderon@cavium.com>
 -M:    Ariel Elior <Ariel.Elior@cavium.com>
 +M:    Michal Kalderon <mkalderon@marvell.com>
 +M:    Ariel Elior <aelior@marvell.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/qedr/
@@@ -12742,7 -12504,7 +12742,7 @@@ F:   Documentation/scsi/LICENSE.qla2xx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
@@@ -12756,16 -12518,16 +12756,16 @@@ F:        Documentation/scsi/LICENSE.qla4xx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 -M:    Shahed Shaikh <Shahed.Shaikh@cavium.com>
 -M:    Manish Chopra <manish.chopra@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Shahed Shaikh <shshaikh@marvell.com>
 +M:    Manish Chopra <manishc@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 -M:    Manish Chopra <manish.chopra@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Manish Chopra <manishc@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlge/
@@@ -12833,11 -12595,11 +12833,11 @@@ F:        Documentation/media/v4l-drivers/qcom
  F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 -M:  Ilia Lin <[email protected]>
 -S:  Maintained
 -F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 -F:  drivers/cpufreq/qcom-cpufreq-kryo.c
 +M:    Ilia Lin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 +F:    drivers/cpufreq/qcom-cpufreq-kryo.c
  
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>
  S:    Maintained
  F:    drivers/net/ethernet/qualcomm/emac/
  
 +QUALCOMM ETHQOS ETHERNET DRIVER
 +M:    Vinod Koul <[email protected]>
 +M:    Niklas Cassel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
 +F:    Documentation/devicetree/bindings/net/qcom,dwmac.txt
 +
  QUALCOMM GENERIC INTERFACE I2C DRIVER
  M:    Alok Chauhan <[email protected]>
  M:    Karthikeyan Ramasubramanian <[email protected]>
@@@ -13012,16 -12766,6 +13012,16 @@@ M: Alexandre Bounine <[email protected]
  S:    Maintained
  F:    drivers/rapidio/
  
 +RAS INFRASTRUCTURE
 +M:    Tony Luck <[email protected]>
 +M:    Borislav Petkov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/ras/
 +F:    include/linux/ras.h
 +F:    include/ras/ras_event.h
 +F:    Documentation/admin-guide/ras.rst
 +
  RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -13122,13 -12866,6 +13122,13 @@@ F: Documentation/devicetree/bindings/ne
  F:    drivers/net/dsa/realtek-smi*
  F:    drivers/net/dsa/rtl83*
  
 +REDPINE WIRELESS DRIVER
 +M:    Amitkumar Karwar <[email protected]>
 +M:    Siva Rebbagondla <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wireless/rsi/
 +
  REGISTER MAP ABSTRACTION
  M:    Mark Brown <[email protected]>
  L:    [email protected]
@@@ -13219,7 -12956,6 +13219,7 @@@ F:   drivers/reset
  F:    Documentation/devicetree/bindings/reset/
  F:    include/dt-bindings/reset/
  F:    include/linux/reset.h
 +F:    include/linux/reset/
  F:    include/linux/reset-controller.h
  
  RESTARTABLE SEQUENCES SUPPORT
@@@ -13720,7 -13456,6 +13720,7 @@@ F:   kernel/sched
  F:    include/linux/sched.h
  F:    include/uapi/linux/sched.h
  F:    include/linux/wait.h
 +F:    include/linux/preempt.h
  
  SCR24X CHIP CARD INTERFACE DRIVER
  M:    Lubomir Rintel <[email protected]>
@@@ -13764,7 -13499,6 +13764,7 @@@ M:   "James E.J. Bottomley" <[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
  M:    "Martin K. Petersen" <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
 +Q:    https://patchwork.kernel.org/project/linux-scsi/list/
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/scsi/
@@@ -13779,18 -13513,6 +13779,18 @@@ F: Documentation/scsi/st.tx
  F:    drivers/scsi/st.*
  F:    drivers/scsi/st_*.h
  
 +SCSI TARGET SUBSYSTEM
 +M:    "Martin K. Petersen" <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +W:    http://www.linux-iscsi.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
 +Q:    https://patchwork.kernel.org/project/target-devel/list/
 +S:    Supported
 +F:    drivers/target/
 +F:    include/target/
 +F:    Documentation/target/
 +
  SCTP PROTOCOL
  M:    Vlad Yasevich <[email protected]>
  M:    Neil Horman <[email protected]>
@@@ -13862,18 -13584,11 +13862,18 @@@ F:        drivers/mmc/host/sdhci-brcmstb
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  M:    Adrian Hunter <[email protected]>
  L:    [email protected]
 -T:    git git://git.infradead.org/users/ahunter/linux-sdhci.git
  S:    Maintained
  F:    drivers/mmc/host/sdhci*
  F:    include/linux/mmc/sdhci*
  
 +EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
 +M:    Adrian Hunter <[email protected]>
 +M:    Ritesh Harjani <[email protected]>
 +M:    Asutosh Das <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/cqhci*
 +
  SYNOPSYS SDHCI COMPLIANT DWC MSHC DRIVER
  M:    Prabu Thangamuthu <[email protected]>
  M:    Manjunath M B <[email protected]>
  S:    Supported
  F:    drivers/net/ethernet/sfc/
  
 +SFF/SFP/SFP+ MODULE SUPPORT
 +M:    Russell King <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/phylink.c
 +F:    drivers/net/phy/sfp*
 +F:    include/linux/phylink.h
 +F:    include/linux/sfp.h
 +
  SGI GRU DRIVER
  M:    Dimitri Sivanich <[email protected]>
  S:    Maintained
@@@ -14009,7 -13715,6 +14009,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Ursula Braun <[email protected]>
 +M:    Karsten Graul <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -14601,7 -14306,6 +14601,7 @@@ F:   arch/arm/mach-spear
  
  SPI NOR SUBSYSTEM
  M:    Marek Vasut <[email protected]>
 +M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  S:    Supported
  F:    drivers/staging/wilc1000/
  
 -STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
 -M:    Arnaud Patard <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/xgifb/
 -
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
@@@ -14970,7 -14679,7 +14970,7 @@@ S:   Maintaine
  F:    drivers/tty/serial/8250/8250_dw.c
  
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
 -M:    Hoan Tran <hotran@apm.com>
 +M:    Hoan Tran <ho[email protected].com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-dwapb.c
@@@ -15062,6 -14771,18 +15062,6 @@@ F:  Documentation/filesystems/sysv-fs.tx
  F:    fs/sysv/
  F:    include/linux/sysv_fs.h
  
 -TARGET SUBSYSTEM
 -M:    "Nicholas A. Bellinger" <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -W:    http://www.linux-iscsi.org
 -W:    http://groups.google.com/group/linux-iscsi-target-dev
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
 -S:    Supported
 -F:    drivers/target/
 -F:    include/target/
 -F:    Documentation/target/
 -
  TASKSTATS STATISTICS INTERFACE
  M:    Balbir Singh <[email protected]>
  S:    Maintained
  S:    Maintained
  F:    sound/soc/ti/
  
 +Texas Instruments' DAC7612 DAC Driver
 +M:    Ricardo Ribalda <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/dac/ti-dac7612.c
 +F:    Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
 +
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -15666,11 -15380,12 +15666,11 @@@ F:        mm/shmem.
  TOMOYO SECURITY MODULE
  M:    Kentaro Takeda <[email protected]>
  M:    Tetsuo Handa <[email protected]>
 -L:    [email protected] (subscribers-only, for developers in English)
 -L:    [email protected] (subscribers-only, for users in English)
 -L:    [email protected] (subscribers-only, for developers in Japanese)
 -L:    [email protected] (subscribers-only, for users in Japanese)
 -W:    http://tomoyo.sourceforge.jp/
 -T:    quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.5.x/tomoyo-lsm/patches/
 +L:    [email protected] (subscribers-only, for developers in English)
 +L:    [email protected] (subscribers-only, for users in English)
 +L:    [email protected] (subscribers-only, for developers in Japanese)
 +L:    [email protected] (subscribers-only, for users in Japanese)
 +W:    https://tomoyo.osdn.jp/
  S:    Maintained
  F:    security/tomoyo/
  
@@@ -15959,16 -15674,14 +15959,16 @@@ F:        drivers/visorbus
  F:    drivers/staging/unisys/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 -M:    Vinayak Holikatti <[email protected]>
 +R:    Alim Akhtar <[email protected]>
 +R:    Avri Altman <[email protected]>
 +R:    Pedro Sousa <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/ufs.txt
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
 -M:    Joao Pinto <jpinto@synopsys.com>
 +M:    Pedro Sousa <pedrom.sousa@synopsys.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
@@@ -16128,7 -15841,6 +16128,7 @@@ F:   drivers/usb/common/usb-otg-fsm.
  USB OVER IP DRIVER
  M:    Valentina Manea <[email protected]>
  M:    Shuah Khan <[email protected]>
 +M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/usb/usbip_protocol.txt
  S:    Maintained
  F:    drivers/gpio/gpio-wcove.c
  
 +WHWAVE RTC DRIVER
 +M:    Dianlong Li <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/rtc/rtc-sd3078.c
 +
  WIIMOTE HID DRIVER
  M:    David Herrmann <[email protected]>
  L:    [email protected]
@@@ -16790,11 -16496,6 +16790,11 @@@ M: David Härdeman <[email protected]
  S:    Maintained
  F:    drivers/media/rc/winbond-cir.c
  
 +RCMM REMOTE CONTROLS DECODER
 +M:    Patrick Lerda <[email protected]>
 +S:    Maintained
 +F:    drivers/media/rc/ir-rcmm-decoder.c
 +
  WINSYSTEMS EBC-C384 WATCHDOG DRIVER
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
@@@ -16937,15 -16638,6 +16937,15 @@@ S: Maintaine
  F:    drivers/platform/x86/
  F:    drivers/platform/olpc/
  
 +X86 PLATFORM DRIVERS - ARCH
 +R:    Darren Hart <[email protected]>
 +R:    Andy Shevchenko <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
 +S:    Maintained
 +F:    arch/x86/platform
 +
  X86 VDSO
  M:    Andy Lutomirski <[email protected]>
  L:    [email protected]
@@@ -16978,30 -16670,10 +16978,30 @@@ T:        git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/tuners/tuner-xc2028.*
  
 +XDP (eXpress Data Path)
 +M:    Alexei Starovoitov <[email protected]>
 +M:    Daniel Borkmann <[email protected]>
 +M:    David S. Miller <[email protected]>
 +M:    Jakub Kicinski <[email protected]>
 +M:    Jesper Dangaard Brouer <[email protected]>
 +M:    John Fastabend <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    net/core/xdp.c
 +F:    include/net/xdp.h
 +F:    kernel/bpf/devmap.c
 +F:    kernel/bpf/cpumap.c
 +F:    include/trace/events/xdp.h
 +K:    xdp
 +N:    xdp
 +
  XDP SOCKETS (AF_XDP)
  M:    Björn Töpel <[email protected]>
  M:    Magnus Karlsson <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    kernel/bpf/xskmap.c
  F:    net/xdp/
diff --combined drivers/rtc/Kconfig
index e1a1f2b1cbbab6a8015d3261cee88db6f252af82,d5063c7915150cd9834eaf2ca078843d1ca4d25e..a71734c416939354129253af00090975ff0f1b5e
@@@ -185,16 -185,6 +185,16 @@@ config RTC_DRV_ABB5ZES
          This driver can also be built as a module. If so, the module
          will be called rtc-ab-b5ze-s3.
  
 +config RTC_DRV_ABEOZ9
 +      select REGMAP_I2C
 +      tristate "Abracon AB-RTCMC-32.768kHz-EOZ9"
 +      help
 +        If you say yes here you get support for the Abracon
 +        AB-RTCMC-32.768kHz-EOA9 I2C RTC chip.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be called rtc-ab-e0z9.
 +
  config RTC_DRV_ABX80X
        tristate "Abracon ABx80x"
        select WATCHDOG_CORE if WATCHDOG
@@@ -611,10 -601,9 +611,10 @@@ config RTC_DRV_RX801
          will be called rtc-rx8010.
  
  config RTC_DRV_RX8581
 -      tristate "Epson RX-8581"
 +      tristate "Epson RX-8571/RX-8581"
        help
 -        If you say yes here you will get support for the Epson RX-8581.
 +        If you say yes here you will get support for the Epson RX-8571/
 +        RX-8581.
  
          This driver can also be built as a module. If so the module
          will be called rtc-rx8581.
@@@ -637,15 -626,6 +637,15 @@@ config RTC_DRV_EM302
          This driver can also be built as a module. If so, the module
          will be called rtc-em3027.
  
 +config RTC_DRV_RV3028
 +      tristate "Micro Crystal RV3028"
 +      help
 +        If you say yes here you get support for the Micro Crystal
 +        RV3028.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be called rtc-rv3028.
 +
  config RTC_DRV_RV8803
        tristate "Micro Crystal RV8803, Epson RX8900"
        help
@@@ -666,15 -646,6 +666,15 @@@ config RTC_DRV_S5
          This driver can also be built as a module. If so, the module
          will be called rtc-s5m.
  
 +config RTC_DRV_SD3078
 +    tristate "ZXW Crystal SD3078"
 +    help
 +      If you say yes here you get support for the ZXW Crystal
 +      SD3078 RTC chips.
 +
 +      This driver can also be built as a module. If so, the module
 +      will be called rtc-sd3078
 +
  endif # I2C
  
  comment "SPI RTC drivers"
@@@ -1314,17 -1285,6 +1314,17 @@@ config RTC_DRV_IMXD
           This driver can also be built as a module, if so, the module
           will be called "rtc-imxdi".
  
 +config RTC_DRV_MESON
 +      tristate "Amlogic Meson RTC"
 +      depends on (ARM && ARCH_MESON) || COMPILE_TEST
 +      select REGMAP_MMIO
 +      help
 +         Support for the RTC block on the Amlogic Meson6, Meson8, Meson8b
 +         and Meson8m2 SoCs.
 +
 +         This driver can also be built as a module, if so, the module
 +         will be called "rtc-meson".
 +
  config RTC_DRV_OMAP
        tristate "TI OMAP Real Time Clock"
        depends on ARCH_OMAP || ARCH_DAVINCI || COMPILE_TEST
@@@ -1548,16 -1508,6 +1548,16 @@@ config RTC_DRV_ARMADA38
          This driver can also be built as a module. If so, the module
          will be called armada38x-rtc.
  
 +config RTC_DRV_CADENCE
 +      tristate "Cadence RTC driver"
 +      depends on OF && HAS_IOMEM
 +      help
 +        If you say Y here you will get access to Cadence RTC IP
 +        found on certain SOCs.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called rtc-cadence.
 +
  config RTC_DRV_FTRTC010
        tristate "Faraday Technology FTRTC010 RTC"
        depends on HAS_IOMEM
@@@ -1729,7 -1679,6 +1729,7 @@@ config RTC_DRV_SNV
  
  config RTC_DRV_IMX_SC
        depends on IMX_SCU
 +      depends on HAVE_ARM_SMCCC
        tristate "NXP i.MX System Controller RTC support"
        help
           If you say yes here you get support for the NXP i.MX System
@@@ -1846,7 -1795,8 +1846,7 @@@ comment "HID Sensor RTC drivers
  config RTC_DRV_HID_SENSOR_TIME
        tristate "HID Sensor Time"
        depends on USB_HID
 -      select IIO
 -      select HID_SENSOR_HUB
 +      depends on HID_SENSOR_HUB && IIO
        select HID_SENSOR_IIO_COMMON
        help
          Say yes here to build support for the HID Sensors of type Time.
@@@ -1864,4 -1814,15 +1864,15 @@@ config RTC_DRV_GOLDFIS
          Goldfish is a code name for the virtual platform developed by Google
          for Android emulation.
  
+ config RTC_DRV_WILCO_EC
+       tristate "Wilco EC RTC"
+       depends on WILCO_EC
+       default m
+       help
+         If you say yes here, you get read/write support for the Real Time
+         Clock on the Wilco Embedded Controller (Wilco is a kind of Chromebook)
+         This can also be built as a module. If so, the module will
+         be named "rtc_wilco_ec".
  endif # RTC_CLASS
diff --combined drivers/rtc/Makefile
index 1bf9f75a7865431295db1e8ae7ac09ba3d69195b,6255ea78da25b225fcc9c214eae985a9b0272e7e..fe3962496685a68a5cbe130e419c6021f052be27
@@@ -28,7 -28,6 +28,7 @@@ obj-$(CONFIG_RTC_DRV_88PM860X)        += rtc-8
  obj-$(CONFIG_RTC_DRV_AB3100)  += rtc-ab3100.o
  obj-$(CONFIG_RTC_DRV_AB8500)  += rtc-ab8500.o
  obj-$(CONFIG_RTC_DRV_ABB5ZES3)        += rtc-ab-b5ze-s3.o
 +obj-$(CONFIG_RTC_DRV_ABEOZ9)  += rtc-ab-eoz9.o
  obj-$(CONFIG_RTC_DRV_ABX80X)  += rtc-abx80x.o
  obj-$(CONFIG_RTC_DRV_AC100)   += rtc-ac100.o
  obj-$(CONFIG_RTC_DRV_ARMADA38X)       += rtc-armada38x.o
@@@ -40,7 -39,6 +40,7 @@@ obj-$(CONFIG_RTC_DRV_AU1XXX)  += rtc-au1
  obj-$(CONFIG_RTC_DRV_BQ32K)   += rtc-bq32k.o
  obj-$(CONFIG_RTC_DRV_BQ4802)  += rtc-bq4802.o
  obj-$(CONFIG_RTC_DRV_BRCMSTB) += rtc-brcmstb-waketimer.o
 +obj-$(CONFIG_RTC_DRV_CADENCE) += rtc-cadence.o
  obj-$(CONFIG_RTC_DRV_CMOS)    += rtc-cmos.o
  obj-$(CONFIG_RTC_DRV_COH901331)       += rtc-coh901331.o
  obj-$(CONFIG_RTC_DRV_CPCAP)   += rtc-cpcap.o
@@@ -102,7 -100,6 +102,7 @@@ obj-$(CONFIG_RTC_DRV_MAX8997)      += rtc-ma
  obj-$(CONFIG_RTC_DRV_MAX8998) += rtc-max8998.o
  obj-$(CONFIG_RTC_DRV_MC13XXX) += rtc-mc13xxx.o
  obj-$(CONFIG_RTC_DRV_MCP795)  += rtc-mcp795.o
 +obj-$(CONFIG_RTC_DRV_MESON)   += rtc-meson.o
  obj-$(CONFIG_RTC_DRV_MOXART)  += rtc-moxart.o
  obj-$(CONFIG_RTC_DRV_MPC5121) += rtc-mpc5121.o
  obj-$(CONFIG_RTC_DRV_MSM6242) += rtc-msm6242.o
@@@ -140,7 -137,6 +140,7 @@@ obj-$(CONFIG_RTC_DRV_RS5C313)      += rtc-rs
  obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o
  obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o
  obj-$(CONFIG_RTC_DRV_RTD119X) += rtc-rtd119x.o
 +obj-$(CONFIG_RTC_DRV_RV3028)  += rtc-rv3028.o
  obj-$(CONFIG_RTC_DRV_RV3029C2)        += rtc-rv3029c2.o
  obj-$(CONFIG_RTC_DRV_RV8803)  += rtc-rv8803.o
  obj-$(CONFIG_RTC_DRV_RX4581)  += rtc-rx4581.o
@@@ -153,7 -149,6 +153,7 @@@ obj-$(CONFIG_RTC_DRV_S3C)  += rtc-s3c.
  obj-$(CONFIG_RTC_DRV_S5M)     += rtc-s5m.o
  obj-$(CONFIG_RTC_DRV_SA1100)  += rtc-sa1100.o
  obj-$(CONFIG_RTC_DRV_SC27XX)  += rtc-sc27xx.o
 +obj-$(CONFIG_RTC_DRV_SD3078)   += rtc-sd3078.o
  obj-$(CONFIG_RTC_DRV_SH)      += rtc-sh.o
  obj-$(CONFIG_RTC_DRV_SIRFSOC) += rtc-sirfsoc.o
  obj-$(CONFIG_RTC_DRV_SNVS)    += rtc-snvs.o
@@@ -177,6 -172,7 +177,7 @@@ obj-$(CONFIG_RTC_DRV_V3020)        += rtc-v302
  obj-$(CONFIG_RTC_DRV_VR41XX)  += rtc-vr41xx.o
  obj-$(CONFIG_RTC_DRV_VRTC)    += rtc-mrst.o
  obj-$(CONFIG_RTC_DRV_VT8500)  += rtc-vt8500.o
+ obj-$(CONFIG_RTC_DRV_WILCO_EC)        += rtc-wilco-ec.o
  obj-$(CONFIG_RTC_DRV_WM831X)  += rtc-wm831x.o
  obj-$(CONFIG_RTC_DRV_WM8350)  += rtc-wm8350.o
  obj-$(CONFIG_RTC_DRV_X1205)   += rtc-x1205.o
This page took 0.216634 seconds and 4 git commands to generate.