]> Git Repo - linux.git/commitdiff
Merge tag 'kvmarm-fixes-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <[email protected]>
Fri, 9 Aug 2019 14:53:39 +0000 (16:53 +0200)
committerPaolo Bonzini <[email protected]>
Fri, 9 Aug 2019 14:53:39 +0000 (16:53 +0200)
KVM/arm fixes for 5.3

- A bunch of switch/case fall-through annotation, fixing one actual bug
- Fix PMU reset bug
- Add missing exception class debug strings

1  2 
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/x86/include/asm/kvm_host.h
arch/x86/kernel/kvm.c
virt/kvm/arm/arm.c

index 8a8880cec34bff3dede566d2b3251542d1d59621,46b826fcb5ad55fed0d8ca92ab10751baabf64a9..7ccd158b3894e7841f16c11597ddbcadf1f7c34d
@@@ -13,7 -13,7 +13,7 @@@
                        For ARM64, ONLY "acpi=off", "acpi=on" or "acpi=force"
                        are available
  
-                       See also Documentation/power/runtime_pm.txt, pci=noacpi
+                       See also Documentation/power/runtime_pm.rst, pci=noacpi
  
        acpi_apic_instance=     [ACPI, IOAPIC]
                        Format: <int>
        acpi_sleep=     [HW,ACPI] Sleep options
                        Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
                                  old_ordering, nonvs, sci_force_enable, nobl }
-                       See Documentation/power/video.txt for information on
+                       See Documentation/power/video.rst for information on
                        s3_bios and s3_mode.
                        s3_beep is for debugging; it makes the PC's speaker beep
                        as soon as the kernel's real-mode entry point is called.
  
        blkdevparts=    Manual partition parsing of block device(s) for
                        embedded devices based on command line input.
-                       See Documentation/block/cmdline-partition.txt
+                       See Documentation/block/cmdline-partition.rst
  
        boot_delay=     Milliseconds to delay each printk during boot.
                        Values larger than 10 seconds (10000) are changed to
                        [KNL, x86_64] select a region under 4G first, and
                        fall back to reserve region above 4G when '@offset'
                        hasn't been specified.
-                       See Documentation/kdump/kdump.rst for further details.
+                       See Documentation/admin-guide/kdump/kdump.rst for further details.
  
        crashkernel=range1:size1[,range2:size2,...][@offset]
                        [KNL] Same as above, but depends on the memory
                        in the running system. The syntax of range is
                        start-[end] where start and end are both
                        a memory unit (amount[KMG]). See also
-                       Documentation/kdump/kdump.rst for an example.
+                       Documentation/admin-guide/kdump/kdump.rst for an example.
  
        crashkernel=size[KMG],high
                        [KNL, x86_64] range could be above 4G. Allow kernel
                        edid/1680x1050.bin, or edid/1920x1080.bin is given
                        and no file with the same name exists. Details and
                        instructions how to build your own EDID data are
-                       available in Documentation/EDID/howto.rst. An EDID
+                       available in Documentation/driver-api/edid.rst. An EDID
                        data set will only be used for a particular connector,
                        if its name and a colon are prepended to the EDID
                        name. Each connector may use a unique EDID data
  
        elevator=       [IOSCHED]
                        Format: { "mq-deadline" | "kyber" | "bfq" }
-                       See Documentation/block/deadline-iosched.txt,
-                       Documentation/block/kyber-iosched.txt and
-                       Documentation/block/bfq-iosched.txt for details.
+                       See Documentation/block/deadline-iosched.rst,
+                       Documentation/block/kyber-iosched.rst and
+                       Documentation/block/bfq-iosched.rst for details.
  
        elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]
                        Specifies physical address of start of kernel core
                        image elf header and optionally the size. Generally
                        kexec loader will pass this option to capture kernel.
-                       See Documentation/kdump/kdump.rst for details.
+                       See Documentation/admin-guide/kdump/kdump.rst for details.
  
        enable_mtrr_cleanup [X86]
                        The kernel tries to adjust MTRR layout from continuous
                        See also Documentation/fault-injection/.
  
        floppy=         [HW]
-                       See Documentation/blockdev/floppy.txt.
+                       See Documentation/admin-guide/blockdev/floppy.rst.
  
        force_pal_cache_flush
                        [IA-64] Avoid check_sal_cache_flush which may hang on
                        Built with CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y,
                        the default is off.
  
+       kprobe_event=[probe-list]
+                       [FTRACE] Add kprobe events and enable at boot time.
+                       The probe-list is a semicolon delimited list of probe
+                       definitions. Each definition is same as kprobe_events
+                       interface, but the parameters are comma delimited.
+                       For example, to add a kprobe event on vfs_read with
+                       arg1 and arg2, add to the command line;
+                             kprobe_event=p,vfs_read,$arg1,$arg2
+                       See also Documentation/trace/kprobetrace.rst "Kernel
+                       Boot Parameter" section.
        kpti=           [ARM64] Control page table isolation of user
                        and kernel address spaces.
                        Default: enabled on cores which need mitigation.
        memblock=debug  [KNL] Enable memblock debug messages.
  
        load_ramdisk=   [RAM] List of ramdisks to load from floppy
-                       See Documentation/blockdev/ramdisk.txt.
+                       See Documentation/admin-guide/blockdev/ramdisk.rst.
  
        lockd.nlm_grace_period=P  [NFS] Assign grace period.
                        Format: <integer>
                        mem_encrypt=on:         Activate SME
                        mem_encrypt=off:        Do not activate SME
  
 -                      Refer to Documentation/virtual/kvm/amd-memory-encryption.rst
 +                      Refer to Documentation/virt/kvm/amd-memory-encryption.rst
                        for details on when memory encryption can be activated.
  
        mem_sleep_default=      [SUSPEND] Default system suspend mode:
                        /sys/module/printk/parameters/console_suspend) to
                        turn on/off it dynamically.
  
+       novmcoredd      [KNL,KDUMP]
+                       Disable device dump. Device dump allows drivers to
+                       append dump data to vmcore so you can collect driver
+                       specified debug info.  Drivers can append the data
+                       without any limit and this data is stored in memory,
+                       so this may cause significant memory stress.  Disabling
+                       device dump can help save memory but the driver debug
+                       data will be no longer available.  This parameter
+                       is only available when CONFIG_PROC_VMCORE_DEVICE_DUMP
+                       is set.
        noaliencache    [MM, NUMA, SLAB] Disables the allocation of alien
                        caches in the slab allocator.  Saves per-node memory,
                        but will impact performance.
                        register save and restore. The kernel will only save
                        legacy floating-point registers on task switch.
  
-       nohugeiomap     [KNL,x86] Disable kernel huge I/O mappings.
+       nohugeiomap     [KNL,x86,PPC] Disable kernel huge I/O mappings.
  
        nosmt           [KNL,S390] Disable symmetric multithreading (SMT).
                        Equivalent to smt=1.
        numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA.
                        'node', 'default' can be specified
                        This can be set from sysctl after boot.
-                       See Documentation/sysctl/vm.txt for details.
+                       See Documentation/admin-guide/sysctl/vm.rst for details.
  
        ohci1394_dma=early      [HW] enable debugging via the ohci1394 driver.
                        See Documentation/debugging-via-ohci1394.txt for more
  
        pcd.            [PARIDE]
                        See header of drivers/block/paride/pcd.c.
-                       See also Documentation/blockdev/paride.txt.
+                       See also Documentation/admin-guide/blockdev/paride.rst.
  
        pci=option[,option...]  [PCI] various PCI subsystem options.
  
                        needed on a platform with proper driver support.
  
        pd.             [PARIDE]
-                       See Documentation/blockdev/paride.txt.
+                       See Documentation/admin-guide/blockdev/paride.rst.
  
        pdcchassis=     [PARISC,HW] Disable/Enable PDC Chassis Status codes at
                        boot time.
                        and performance comparison.
  
        pf.             [PARIDE]
-                       See Documentation/blockdev/paride.txt.
+                       See Documentation/admin-guide/blockdev/paride.rst.
  
        pg.             [PARIDE]
-                       See Documentation/blockdev/paride.txt.
+                       See Documentation/admin-guide/blockdev/paride.rst.
  
        pirq=           [SMP,APIC] Manual mp-table setup
                        See Documentation/x86/i386/IO-APIC.rst.
  
        prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
                        before loading.
-                       See Documentation/blockdev/ramdisk.txt.
+                       See Documentation/admin-guide/blockdev/ramdisk.rst.
  
        psi=            [KNL] Enable or disable pressure stall information
                        tracking.
        pstore.backend= Specify the name of the pstore backend to use
  
        pt.             [PARIDE]
-                       See Documentation/blockdev/paride.txt.
+                       See Documentation/admin-guide/blockdev/paride.rst.
  
        pti=            [X86_64] Control Page Table Isolation of user and
                        kernel address spaces.  Disabling this feature
                        See Documentation/admin-guide/md.rst.
  
        ramdisk_size=   [RAM] Sizes of RAM disks in kilobytes
-                       See Documentation/blockdev/ramdisk.txt.
+                       See Documentation/admin-guide/blockdev/ramdisk.rst.
  
        random.trust_cpu={on,off}
                        [KNL] Enable or disable trusting the use of the
  
        relax_domain_level=
                        [KNL, SMP] Set scheduler's default relax_domain_level.
-                       See Documentation/cgroup-v1/cpusets.rst.
+                       See Documentation/admin-guide/cgroup-v1/cpusets.rst.
  
        reserve=        [KNL,BUGS] Force kernel to ignore I/O ports or memory
                        Format: <base1>,<size1>[,<base2>,<size2>,...]
                        Specify the offset from the beginning of the partition
                        given by "resume=" at which the swap header is located,
                        in <PAGE_SIZE> units (needed only for swap files).
-                       See  Documentation/power/swsusp-and-swap-files.txt
+                       See  Documentation/power/swsusp-and-swap-files.rst
  
        resumedelay=    [HIBERNATION] Delay (in seconds) to pause before attempting to
                        read the resume files
                        Format: <integer>
  
        sonypi.*=       [HW] Sony Programmable I/O Control Device driver
-                       See Documentation/laptops/sonypi.txt
+                       See Documentation/admin-guide/laptops/sonypi.rst
  
        spectre_v2=     [X86] Control mitigation of Spectre variant 2
                        (indirect branch speculation) vulnerability.
        swapaccount=[0|1]
                        [KNL] Enable accounting of swap in memory resource
                        controller if no parameter or 1 is given or disable
-                       it if 0 is given (See Documentation/cgroup-v1/memory.rst)
+                       it if 0 is given (See Documentation/admin-guide/cgroup-v1/memory.rst)
  
        swiotlb=        [ARM,IA-64,PPC,MIPS,X86]
                        Format: { <int> | force | noforce }
                        Force threading of all interrupt handlers except those
                        marked explicitly IRQF_NO_THREAD.
  
-       tmem            [KNL,XEN]
-                       Enable the Transcendent memory driver if built-in.
-       tmem.cleancache=0|1 [KNL, XEN]
-                       Default is on (1). Disable the usage of the cleancache
-                       API to send anonymous pages to the hypervisor.
-       tmem.frontswap=0|1 [KNL, XEN]
-                       Default is on (1). Disable the usage of the frontswap
-                       API to send swap pages to the hypervisor. If disabled
-                       the selfballooning and selfshrinking are force disabled.
-       tmem.selfballooning=0|1 [KNL, XEN]
-                       Default is on (1). Disable the driving of swap pages
-                       to the hypervisor.
-       tmem.selfshrinking=0|1 [KNL, XEN]
-                       Default is on (1). Partial swapoff that immediately
-                       transfers pages from Xen hypervisor back to the
-                       kernel based on different criteria.
        topology=       [S390]
                        Format: {off | on}
                        Specify if the kernel should make use of the cpu
  
        vga=            [BOOT,X86-32] Select a particular video mode
                        See Documentation/x86/boot.rst and
-                       Documentation/svga.txt.
+                       Documentation/admin-guide/svga.rst.
                        Use vga=ask for menu.
                        This is actually a boot loader parameter; the value is
                        passed to the kernel using a special protocol.
        xen_nopv        [X86]
                        Disables the PV optimizations forcing the HVM guest to
                        run as generic HVM guest with no PV drivers.
+                       This option is obsoleted by the "nopv" option, which
+                       has equivalent effect for XEN platform.
  
        xen_scrub_pages=        [XEN]
                        Boolean option to control scrubbing pages before giving them back
                        improve timer resolution at the expense of processing
                        more timer interrupts.
  
+       nopv=           [X86,XEN,KVM,HYPER_V,VMWARE]
+                       Disables the PV optimizations forcing the guest to run
+                       as generic guest with no PV drivers. Currently support
+                       XEN HVM, KVM, HYPER_V and VMWARE guest.
        xirc2ps_cs=     [NET,PCMCIA]
                        Format:
                        <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
  
+       xive=           [PPC]
+                       By default on POWER9 and above, the kernel will
+                       natively use the XIVE interrupt controller. This option
+                       allows the fallback firmware mode to be used:
+                       off       Fallback to firmware control of XIVE interrupt
+                                 controller on both pseries and powernv
+                                 platforms. Only useful on POWER9 and above.
        xhci-hcd.quirks         [USB,KNL]
                        A hex value specifying bitmask with supplemental xhci
                        host controller quirks. Meaning of each bit can be
diff --combined MAINTAINERS
index 1aec93695040442cf61d9b89cf62e33febdfd7cb,783569e3c4b48752c3555e9bee6fbc87adad5117..5e1f9ee8f86f7f08273ba1a895176348c569b7dd
@@@ -1155,7 -1155,7 +1155,7 @@@ APPLIED MICRO (APM) X-GENE SOC PM
  M:    Khuong Dinh <[email protected]>
  S:    Supported
  F:    drivers/perf/xgene_pmu.c
- F:    Documentation/perf/xgene-pmu.txt
+ F:    Documentation/admin-guide/perf/xgene-pmu.rst
  F:    Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt
  
  APTINA CAMERA SENSOR PLL
@@@ -1236,7 -1236,7 +1236,7 @@@ M:      James (Qian) Wang <james.qian.wang@a
  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
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/arm/display/include/
  F:    drivers/gpu/drm/arm/display/komeda/
  F:    Documentation/devicetree/bindings/display/arm,komeda.txt
@@@ -1247,7 -1247,7 +1247,7 @@@ M:      Liviu Dudau <[email protected]
  M:    Brian Starkey <[email protected]>
  L:    Mali DP Maintainers <[email protected]>
  S:    Supported
- T:    git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/arm/
  F:    Documentation/devicetree/bindings/display/arm,malidp.txt
  F:    Documentation/gpu/afbc.rst
@@@ -1264,7 -1264,7 +1264,7 @@@ F:      include/uapi/drm/panfrost_drm.
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <[email protected]>
  S:    Maintained
- F:    arch/arm/lib/floppydma.S
+ F:    arch/arm/mach-rpc/floppydma.S
  F:    arch/arm/include/asm/floppy.h
  
  ARM PMU PROFILING AND DEBUGGING
@@@ -1863,6 -1863,7 +1863,7 @@@ F:      arch/arm/mach-orion5x
  F:    arch/arm/plat-orion/
  F:    arch/arm/boot/dts/dove*
  F:    arch/arm/boot/dts/orion5x*
+ T:    git git://git.infradead.org/linux-mvebu.git
  
  ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
  M:    Jason Cooper <[email protected]>
@@@ -1883,6 -1884,7 +1884,7 @@@ F:      drivers/irqchip/irq-armada-370-xp.
  F:    drivers/irqchip/irq-mvebu-*
  F:    drivers/pinctrl/mvebu/
  F:    drivers/rtc/rtc-armada38x.c
+ T:    git git://git.infradead.org/linux-mvebu.git
  
  ARM/Mediatek RTC DRIVER
  M:    Eddie Huang <[email protected]>
@@@ -2089,7 -2091,6 +2091,6 @@@ S:      Maintaine
  
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <[email protected]>
- M:    David Brown <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/qcom/
@@@ -2111,7 -2112,7 +2112,7 @@@ F:      drivers/i2c/busses/i2c-qup.
  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/mmc/host/sdhci-msm.c
  F:    drivers/pci/controller/dwc/pcie-qcom.c
  F:    drivers/phy/qualcomm/
  F:    drivers/power/*/msm*
@@@ -2218,7 -2219,7 +2219,7 @@@ F:      drivers/*/*s3c64xx
  F:    drivers/*/*s5pv210*
  F:    drivers/memory/samsung/*
  F:    drivers/soc/samsung/*
- F:    Documentation/arm/Samsung/
+ F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/sram/samsung-sram.txt
  F:    Documentation/devicetree/bindings/power/pd-samsung.txt
@@@ -2625,6 -2626,15 +2626,15 @@@ S:    Maintaine
  F:    Documentation/hwmon/asc7621.rst
  F:    drivers/hwmon/asc7621.c
  
+ ASPEED PINCTRL DRIVERS
+ M:    Andrew Jeffery <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ L:    [email protected] (moderated for non-subscribers)
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/pinctrl/aspeed/
+ F:    Documentation/devicetree/bindings/pinctrl/aspeed,*
  ASPEED VIDEO ENGINE DRIVER
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -2680,7 -2690,7 +2690,7 @@@ ATA OVER ETHERNET (AOE) DRIVE
  M:    "Justin Sanders" <[email protected]>
  W:    http://www.openaoe.org/
  S:    Supported
- F:    Documentation/aoe/
+ F:    Documentation/admin-guide/aoe/
  F:    drivers/block/aoe/
  
  ATHEROS 71XX/9XXX GPIO DRIVER
@@@ -2959,7 -2969,7 +2969,7 @@@ M:      Jens Axboe <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    block/bfq-*
- F:    Documentation/block/bfq-iosched.txt
+ F:    Documentation/block/bfq-iosched.rst
  
  BFS FILE SYSTEM
  M:    "Tigran A. Aivazian" <[email protected]>
@@@ -3099,9 -3109,9 +3109,9 @@@ S:      Maintaine
  F:    arch/riscv/net/
  
  BPF JIT for S390
+ M:    Ilya Leoshkevich <[email protected]>
  M:    Heiko Carstens <[email protected]>
  M:    Vasily Gorbik <[email protected]>
- M:    Christian Borntraeger <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -3756,7 -3766,7 +3766,7 @@@ F:      arch/powerpc/platforms/cell
  
  CEPH COMMON CODE (LIBCEPH)
  M:    Ilya Dryomov <[email protected]>
- M:    "Yan, Zheng" <[email protected]>
+ M:    Jeff Layton <[email protected]>
  M:    Sage Weil <[email protected]>
  L:    [email protected]
  W:    http://ceph.com/
@@@ -3768,7 -3778,7 +3778,7 @@@ F:      include/linux/ceph
  F:    include/linux/crush/
  
  CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
- M:    "Yan, Zheng" <[email protected]>
+ M:    Jeff Layton <[email protected]>
  M:    Sage Weil <[email protected]>
  M:    Ilya Dryomov <[email protected]>
  L:    [email protected]
@@@ -4149,7 -4159,7 +4159,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
  F:    Documentation/admin-guide/cgroup-v2.rst
- F:    Documentation/cgroup-v1/
+ F:    Documentation/admin-guide/cgroup-v1/
  F:    include/linux/cgroup*
  F:    kernel/cgroup/
  
@@@ -4160,7 -4170,7 +4170,7 @@@ W:      http://www.bullopensource.org/cpuset
  W:    http://oss.sgi.com/projects/cpusets/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
- F:    Documentation/cgroup-v1/cpusets.rst
+ F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
  F:    kernel/cgroup/cpuset.c
  
@@@ -4174,6 -4184,19 +4184,19 @@@ S:    Maintaine
  F:    mm/memcontrol.c
  F:    mm/swap_cgroup.c
  
+ CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
+ M:    Tejun Heo <[email protected]>
+ M:    Jens Axboe <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ T:    git git://git.kernel.dk/linux-block
+ F:    Documentation/cgroup-v1/blkio-controller.rst
+ F:    block/blk-cgroup.c
+ F:    include/linux/blk-cgroup.h
+ F:    block/blk-throttle.c
+ F:    block/blk-iolatency.c
+ F:    block/bfq-cgroup.c
  CORETEMP HARDWARE MONITORING DRIVER
  M:    Fenghua Yu <[email protected]>
  L:    [email protected]
@@@ -4633,7 -4656,7 +4656,7 @@@ DELL SYSTEMS MANAGEMENT BASE DRIVER (dc
  M:    Stuart Hayes <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/dcdbas.txt
+ F:    Documentation/driver-api/dcdbas.rst
  F:    drivers/platform/x86/dcdbas.*
  
  DELL WMI NOTIFICATIONS DRIVER
  S:    Supported
  F:    drivers/mtd/nand/raw/denali*
  
+ DESIGNWARE EDMA CORE IP DRIVER
+ M:    Gustavo Pimentel <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/dma/dw-edma/
+ F:    include/linux/dma/edma.h
  DESIGNWARE USB2 DRD IP DRIVER
  M:    Minas Harutyunyan <[email protected]>
  L:    [email protected]
@@@ -4726,7 -4756,7 +4756,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
  T:    quilt http://people.redhat.com/agk/patches/linux/editing/
  S:    Maintained
- F:    Documentation/device-mapper/
+ F:    Documentation/admin-guide/device-mapper/
  F:    drivers/md/Makefile
  F:    drivers/md/Kconfig
  F:    drivers/md/dm*
@@@ -4997,7 -5027,7 +5027,7 @@@ T:      git git://git.linbit.com/drbd-8.4.gi
  S:    Supported
  F:    drivers/block/drbd/
  F:    lib/lru_cache.c
- F:    Documentation/blockdev/drbd/
+ F:    Documentation/admin-guide/blockdev/
  
  DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -5190,6 -5220,13 +5220,13 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/st7735r.c
  F:    Documentation/devicetree/bindings/display/sitronix,st7735r.txt
  
+ DRM DRIVER FOR ST-ERICSSON MCDE
+ M:    Linus Walleij <[email protected]>
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
+ S:    Maintained
+ F:    drivers/gpu/drm/mcde/
+ F:    Documentation/devicetree/bindings/display/ste,mcde.txt
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
@@@ -5475,6 -5512,7 +5512,7 @@@ T:      git git://anongit.freedesktop.org/dr
  
  DRM PANEL DRIVERS
  M:    Thierry Reding <[email protected]>
+ R:    Sam Ravnborg <[email protected]>
  L:    [email protected]
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
@@@ -5503,7 -5541,6 +5541,6 @@@ F:      Documentation/gpu/xen-front.rs
  DRM TTM SUBSYSTEM
  M:    Christian Koenig <[email protected]>
  M:    Huang Rui <[email protected]>
- M:    Junwei Zhang <[email protected]>
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Maintained
  L:    [email protected]
@@@ -6071,7 -6108,7 +6108,7 @@@ M:      Ard Biesheuvel <ard.biesheuvel@linar
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
  S:    Maintained
- F:    Documentation/efi-stub.txt
+ F:    Documentation/admin-guide/efi-stub.rst
  F:    arch/*/kernel/efi.c
  F:    arch/x86/boot/compressed/eboot.[ch]
  F:    arch/*/include/asm/efi.h
@@@ -6285,9 -6322,8 +6322,8 @@@ F:      Documentation/devicetree/bindings/co
  F:    drivers/counter/ftm-quaddec.c
  
  FLOPPY DRIVER
- M:    Jiri Kosina <[email protected]>
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
- S:    Odd fixes
+ S:    Orphan
+ L:    [email protected]
  F:    drivers/block/floppy.c
  
  FMC SUBSYSTEM
@@@ -6490,6 -6526,7 +6526,7 @@@ M:      Li Yang <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
+ F:    Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt
  F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
  F:    include/linux/fsl/
@@@ -6532,7 -6569,7 +6569,7 @@@ M:      "Rafael J. Wysocki" <[email protected]
  M:    Pavel Machek <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/power/freezing-of-tasks.txt
+ F:    Documentation/power/freezing-of-tasks.rst
  F:    include/linux/freezer.h
  F:    kernel/freezer.c
  
@@@ -6646,7 -6683,7 +6683,7 @@@ S:      Maintaine
  F:    scripts/gcc-plugins/
  F:    scripts/gcc-plugin.sh
  F:    scripts/Makefile.gcc-plugins
- F:    Documentation/gcc-plugins.txt
+ F:    Documentation/core-api/gcc-plugins.rst
  
  GASKET DRIVER FRAMEWORK
  M:    Rob Springer <[email protected]>
@@@ -6858,7 -6895,7 +6895,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/
  F:    Documentation/driver-api/gpio/
- F:    Documentation/gpio/
+ F:    Documentation/admin-guide/gpio/
  F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    drivers/gpio/
@@@ -7079,7 -7116,7 +7116,7 @@@ M:      Herbert Xu <[email protected]
  L:    [email protected]
  S:    Odd fixes
  F:    Documentation/devicetree/bindings/rng/
- F:    Documentation/hw_random.txt
+ F:    Documentation/admin-guide/hw_random.rst
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
  
@@@ -7253,7 -7290,7 +7290,7 @@@ M:      Shaokun Zhang <zhangshaokun@hisilico
  W:    http://www.hisilicon.com
  S:    Supported
  F:    drivers/perf/hisilicon
- F:    Documentation/perf/hisi-pmu.txt
+ F:    Documentation/admin-guide/perf/hisi-pmu.rst
  
  HISILICON ROCE DRIVER
  M:    Lijun Ou <[email protected]>
@@@ -7426,6 -7463,14 +7463,14 @@@ F:    include/asm-generic/mshyperv.
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
+ HYPERBUS SUPPORT
+ M:    Vignesh Raghavendra <[email protected]>
+ S:    Supported
+ F:    drivers/mtd/hyperbus/
+ F:    include/linux/mtd/hyperbus.h
+ F:    Documentation/devicetree/bindings/mtd/cypress,hyperflash.txt
+ F:    Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
  HYPERVISOR VIRTUAL CONSOLE DRIVER
  L:    [email protected]
  S:    Odd Fixes
  S:    Maintained
  F:    drivers/mtd/nand/raw/ingenic/
  
+ INGENIC JZ47xx SoCs
+ M:    Paul Cercueil <[email protected]>
+ S:    Maintained
+ F:    arch/mips/boot/dts/ingenic/
+ F:    arch/mips/include/asm/mach-jz4740/
+ F:    arch/mips/jz4740/
+ F:    drivers/clk/ingenic/
+ F:    drivers/dma/dma-jz4780.c
+ F:    drivers/gpu/drm/ingenic/
+ F:    drivers/i2c/busses/i2c-jz4780.c
+ F:    drivers/iio/adc/ingenic-adc.c
+ F:    drivers/irqchip/irq-ingenic.c
+ F:    drivers/memory/jz4780-nemc.c
+ F:    drivers/mmc/host/jz4740_mmc.c
+ F:    drivers/mtd/nand/raw/ingenic/
+ F:    drivers/pinctrl/pinctrl-ingenic.c
+ F:    drivers/power/supply/ingenic-battery.c
+ F:    drivers/pwm/pwm-jz4740.c
+ F:    drivers/rtc/rtc-jz4740.c
+ F:    drivers/tty/serial/8250/8250_ingenic.c
+ F:    drivers/usb/musb/jz4740.c
+ F:    drivers/watchdog/jz4740_wdt.c
+ F:    include/dt-bindings/iio/adc/ingenic,adc.h
+ F:    include/linux/mfd/ingenic-tcu.h
+ F:    sound/soc/jz4740/
+ F:    sound/soc/codecs/jz47*
  INOTIFY
  M:    Jan Kara <[email protected]>
  R:    Amir Goldstein <[email protected]>
@@@ -8198,7 -8270,7 +8270,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/gpio/gpio-*cove.c
  F:    drivers/gpio/gpio-msic.c
  
- INTEL MULTIFUNCTION PMIC DEVICE DRIVERS
+ INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
  R:    Andy Shevchenko <[email protected]>
  S:    Maintained
  F:    drivers/mfd/intel_msic.c
@@@ -8229,6 -8301,14 +8301,14 @@@ S:    Supporte
  F:    drivers/infiniband/hw/i40iw/
  F:    include/uapi/rdma/i40iw-abi.h
  
+ INTEL SPEED SELECT TECHNOLOGY
+ M:    Srinivas Pandruvada <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/platform/x86/intel_speed_select_if/
+ F:    tools/power/x86/intel-speed-select/
+ F:    include/uapi/linux/isst_if.h
  INTEL TELEMETRY DRIVER
  M:    Rajneesh Bhardwaj <[email protected]>
  M:    "David E. Box" <[email protected]>
@@@ -8287,7 -8367,7 +8367,7 @@@ L:      [email protected]
  W:    http://tboot.sourceforge.net
  T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
  S:    Supported
- F:    Documentation/intel_txt.txt
+ F:    Documentation/x86/intel_txt.rst
  F:    include/linux/tboot.h
  F:    arch/x86/kernel/tboot.c
  
@@@ -8301,7 -8381,7 +8381,7 @@@ INTERCONNECT AP
  M:    Georgi Djakov <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/interconnect/
+ F:    Documentation/driver-api/interconnect.rst
  F:    Documentation/devicetree/bindings/interconnect/
  F:    drivers/interconnect/
  F:    include/dt-bindings/interconnect/
@@@ -8337,6 -8417,7 +8417,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:    Supported
  F:    fs/iomap.c
+ F:    fs/iomap/
  F:    include/linux/iomap.h
  
  IOMMU DRIVERS
@@@ -8437,7 -8518,7 +8518,7 @@@ F:      drivers/irqchip
  ISA
  M:    William Breathitt Gray <[email protected]>
  S:    Maintained
- F:    Documentation/isa.txt
+ F:    Documentation/driver-api/isa.rst
  F:    drivers/base/isa.c
  F:    include/linux/isa.h
  
@@@ -8452,7 -8533,7 +8533,7 @@@ F:      drivers/media/radio/radio-isa
  ISAPNP
  M:    Jaroslav Kysela <[email protected]>
  S:    Maintained
- F:    Documentation/isapnp.txt
+ F:    Documentation/driver-api/isapnp.rst
  F:    drivers/pnp/isapnp/
  F:    include/linux/isapnp.h
  
@@@ -8650,7 -8731,7 +8731,7 @@@ R:      Vivek Goyal <[email protected]
  L:    [email protected]
  W:    http://lse.sourceforge.net/kdump/
  S:    Maintained
- F:    Documentation/kdump/
+ F:    Documentation/admin-guide/kdump/
  
  KEENE FM RADIO TRANSMITTER DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -8727,7 -8808,7 +8808,7 @@@ L:      [email protected]
  W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  S:    Supported
 -F:    Documentation/virtual/kvm/
 +F:    Documentation/virt/kvm/
  F:    include/trace/events/kvm.h
  F:    include/uapi/asm-generic/kvm*
  F:    include/uapi/linux/kvm*
@@@ -9006,7 -9087,7 +9087,7 @@@ M:      Matan Ziv-Av <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-platform-lg-laptop
- F:    Documentation/laptops/lg-laptop.rst
+ F:    Documentation/admin-guide/laptops/lg-laptop.rst
  F:    drivers/platform/x86/lg-laptop.c
  
  LG2160 MEDIA DRIVER
@@@ -9375,7 -9456,7 +9456,7 @@@ M:      "Richard Russon (FlatCap)" <ldm@flat
  L:    [email protected]
  W:    http://www.linux-ntfs.org/content/view/19/37/
  S:    Maintained
- F:    Documentation/ldm.txt
+ F:    Documentation/admin-guide/ldm.rst
  F:    block/partitions/ldm.*
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
+ MEDIATEK MT7621/28/88 I2C DRIVER
+ M:    Stefan Roese <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/i2c/busses/i2c-mt7621.c
+ F:    Documentation/devicetree/bindings/i2c/i2c-mt7621.txt
  MEDIATEK NAND CONTROLLER DRIVER
  M:    Xiaolei Li <[email protected]>
  L:    [email protected]
@@@ -10330,7 -10418,7 +10418,7 @@@ M:   Johannes Thumshirn <morbidrsa@gmail.
  S:    Maintained
  F:    drivers/mcb/
  F:    include/linux/mcb.h
- F:    Documentation/men-chameleon-bus.txt
+ F:    Documentation/driver-api/men-chameleon-bus.rst
  
  MEN F21BMC (Board Management Controller)
  M:    Andreas Werner <[email protected]>
@@@ -10744,7 -10832,7 +10832,7 @@@ F:   include/uapi/linux/meye.
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <[email protected]>
  S:    Maintained
- F:    Documentation/serial/moxa-smartio.rst
+ F:    Documentation/driver-api/serial/moxa-smartio.rst
  F:    drivers/tty/mxser.*
  
  MR800 AVERMEDIA USB FM RADIO DRIVER
@@@ -10988,14 -11076,6 +11076,6 @@@ F:  driver/net/net_failover.
  F:    include/net/net_failover.h
  F:    Documentation/networking/net_failover.rst
  
- NETEFFECT IWARP RNIC DRIVER (IW_NES)
- M:    Faisal Latif <[email protected]>
- L:    [email protected]
- W:    http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm
- S:    Supported
- F:    drivers/infiniband/hw/nes/
- F:    include/uapi/rdma/nes-abi.h
  NETEM NETWORK EMULATOR
  M:    Stephen Hemminger <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -11053,7 -11133,7 +11133,7 @@@ M:   Josef Bacik <[email protected]
  S:    Maintained
  L:    [email protected]
  L:    [email protected]
- F:    Documentation/blockdev/nbd.txt
+ F:    Documentation/admin-guide/blockdev/nbd.rst
  F:    drivers/block/nbd.c
  F:    include/trace/events/nbd.h
  F:    include/uapi/linux/nbd.h
@@@ -11512,7 -11592,7 +11592,7 @@@ F:   arch/powerpc/include/asm/pnv-ocxl.
  F:    drivers/misc/ocxl/
  F:    include/misc/ocxl*
  F:    include/uapi/misc/ocxl.h
- F:    Documentation/accelerators/ocxl.rst
+ F:    Documentation/userspace-api/accelerators/ocxl.rst
  
  OMAP AUDIO SUPPORT
  M:    Peter Ujfalusi <[email protected]>
  L:    [email protected]
  S:    Orphan
  F:    drivers/video/fbdev/omap2/
- F:    Documentation/arm/OMAP/DSS
+ F:    Documentation/arm/omap/dss.rst
  
  OMAP FRAMEBUFFER SUPPORT
  L:    [email protected]
@@@ -11829,11 -11909,13 +11909,13 @@@ F:        include/linux/mtd/onenand*.
  
  OP-TEE DRIVER
  M:    Jens Wiklander <[email protected]>
+ L:    [email protected]
  S:    Maintained
  F:    drivers/tee/optee/
  
  OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
  M:    Sumit Garg <[email protected]>
+ L:    [email protected]
  S:    Maintained
  F:    drivers/char/hw_random/optee-rng.c
  
@@@ -11920,7 -12002,7 +12002,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
  F:    drivers/opp/
  F:    include/linux/pm_opp.h
- F:    Documentation/power/opp.txt
+ F:    Documentation/power/opp.rst
  F:    Documentation/devicetree/bindings/opp/
  
  OPL4 DRIVER
@@@ -12035,7 -12117,7 +12117,7 @@@ PARALLEL LCD/KEYPAD PANEL DRIVE
  M:    Willy Tarreau <[email protected]>
  M:    Ksenija Stanojevic <[email protected]>
  S:    Odd Fixes
- F:    Documentation/auxdisplay/lcd-panel-cgram.txt
+ F:    Documentation/admin-guide/lcd-panel-cgram.rst
  F:    drivers/auxdisplay/panel.c
  
  PARALLEL PORT SUBSYSTEM
@@@ -12047,14 -12129,15 +12129,15 @@@ F:        drivers/parport
  F:    include/linux/parport*.h
  F:    drivers/char/ppdev.c
  F:    include/uapi/linux/ppdev.h
- F:    Documentation/parport*.txt
+ F:    Documentation/driver-api/parport*.rst
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <[email protected]>
- M:    Alok Kataria <[email protected]>
+ M:    Thomas Hellstrom <[email protected]>
+ M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/virtual/paravirt_ops.txt
 +F:    Documentation/virt/paravirt_ops.txt
  F:    arch/*/kernel/paravirt*
  F:    arch/*/include/asm/paravirt*.h
  F:    include/linux/hypervisor.h
@@@ -12063,7 -12146,7 +12146,7 @@@ PARIDE DRIVERS FOR PARALLEL PORT IDE DE
  M:    Tim Waugh <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
- F:    Documentation/blockdev/paride.txt
+ F:    Documentation/admin-guide/blockdev/paride.rst
  F:    drivers/block/paride/
  
  PARISC ARCHITECTURE
@@@ -12222,7 -12305,7 +12305,7 @@@ M:   Kurt Schwemmer <kurt.schwemmer@micro
  M:    Logan Gunthorpe <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/switchtec.txt
+ F:    Documentation/driver-api/switchtec.rst
  F:    Documentation/ABI/testing/sysfs-class-switchtec
  F:    drivers/pci/switch/switchtec*
  F:    include/uapi/linux/switchtec_ioctl.h
@@@ -12307,7 -12390,7 +12390,7 @@@ M:   Sam Bobroff <[email protected]
  M:    Oliver O'Halloran <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/PCI/pci-error-recovery.txt
+ F:    Documentation/PCI/pci-error-recovery.rst
  F:    drivers/pci/pcie/aer.c
  F:    drivers/pci/pcie/dpc.c
  F:    drivers/pci/pcie/err.c
@@@ -12320,7 -12403,7 +12403,7 @@@ PCI ERROR RECOVER
  M:    Linas Vepstas <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/PCI/pci-error-recovery.txt
+ F:    Documentation/PCI/pci-error-recovery.rst
  
  PCI MSI DRIVER FOR ALTERA MSI IP
  M:    Ley Foon Tan <[email protected]>
@@@ -12569,6 -12652,17 +12652,17 @@@ F: arch/arm/boot/dts/picoxcell
  F:    arch/arm/mach-picoxcell/
  F:    drivers/crypto/picoxcell*
  
+ PIDFD API
+ M:    Christian Brauner <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
+ F:    samples/pidfd/
+ F:    tools/testing/selftests/pidfd/
+ K:    (?i)pidfd
+ K:    (?i)clone3
+ K:    \b(clone_args|kernel_clone_args)\b
  PIN CONTROL SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -12754,6 -12848,7 +12848,7 @@@ F:   drivers/base/power
  F:    include/linux/pm.h
  F:    include/linux/pm_*
  F:    include/linux/powercap.h
+ F:    include/linux/intel_rapl.h
  F:    drivers/powercap/
  F:    kernel/configs/nopm.config
  
@@@ -12983,7 -13078,7 +13078,7 @@@ M:   Thierry Reding <thierry.reding@gmail
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git
- F:    Documentation/pwm.txt
+ F:    Documentation/driver-api/pwm.rst
  F:    Documentation/devicetree/bindings/pwm/
  F:    include/linux/pwm.h
  F:    drivers/pwm/
@@@ -13205,7 -13300,7 +13300,7 @@@ M:   Niklas Cassel <niklas.cassel@linaro.
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
- F:    Documentation/devicetree/bindings/net/qcom,dwmac.txt
+ F:    Documentation/devicetree/bindings/net/qcom,ethqos.txt
  
  QUALCOMM GENERIC INTERFACE I2C DRIVER
  M:    Alok Chauhan <[email protected]>
@@@ -13344,7 -13439,7 +13439,7 @@@ F:   drivers/net/wireless/ralink/rt2x00
  RAMDISK RAM BLOCK DEVICE DRIVER
  M:    Jens Axboe <[email protected]>
  S:    Maintained
- F:    Documentation/blockdev/ramdisk.txt
+ F:    Documentation/admin-guide/blockdev/ramdisk.rst
  F:    drivers/block/brd.c
  
  RANCHU VIRTUAL BOARD FOR MIPS
@@@ -13453,7 -13548,7 +13548,7 @@@ Q:   http://patchwork.ozlabs.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/rtc/
- F:    Documentation/rtc.txt
+ F:    Documentation/admin-guide/rtc.rst
  F:    drivers/rtc/
  F:    include/linux/rtc.h
  F:    include/uapi/linux/rtc.h
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/remoteproc/
+ F:    Documentation/ABI/testing/sysfs-class-remoteproc
  F:    Documentation/remoteproc.txt
  F:    drivers/remoteproc/
  F:    include/linux/remoteproc.h
+ F:    include/linux/remoteproc/
  
  REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
  M:    Ohad Ben-Cohen <[email protected]>
@@@ -13515,8 -13612,11 +13612,11 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/rpmsg/
  F:    Documentation/rpmsg.txt
+ F:    Documentation/ABI/testing/sysfs-bus-rpmsg
  F:    include/linux/rpmsg.h
  F:    include/linux/rpmsg/
+ F:    include/uapi/linux/rpmsg.h
+ F:    samples/rpmsg/
  
  RENESAS CLOCK DRIVERS
  M:    Geert Uytterhoeven <[email protected]>
@@@ -13597,7 -13697,7 +13697,7 @@@ W:   http://wireless.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:    Maintained
- F:    Documentation/rfkill.txt
+ F:    Documentation/driver-api/rfkill.rst
  F:    Documentation/ABI/stable/sysfs-class-rfkill
  F:    net/rfkill/
  F:    include/linux/rfkill.h
@@@ -13628,7 -13728,7 +13728,7 @@@ RISC-V ARCHITECTUR
  M:    Palmer Dabbelt <[email protected]>
  M:    Albert Ou <[email protected]>
  L:    [email protected]
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
  S:    Supported
  F:    arch/riscv/
  K:    riscv
@@@ -13666,7 -13766,7 +13766,7 @@@ ROCKETPORT DRIVE
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
  S:    Maintained
- F:    Documentation/serial/rocket.rst
+ F:    Documentation/driver-api/serial/rocket.rst
  F:    drivers/tty/rocket*
  
  ROCKETPORT EXPRESS/INFINITY DRIVER
@@@ -14060,7 -14160,7 +14160,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/phy/samsung-phy.txt
- F:    Documentation/phy/samsung-usb2.txt
+ F:    Documentation/driver-api/phy/samsung-usb2.rst
  F:    drivers/phy/samsung/phy-exynos4210-usb2.c
  F:    drivers/phy/samsung/phy-exynos4x12-usb2.c
  F:    drivers/phy/samsung/phy-exynos5250-usb2.c
@@@ -14366,7 -14466,7 +14466,7 @@@ SGI SN-IA64 (Altix) SERIAL CONSOLE DRIV
  M:    Pat Gefre <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/ia64/serial.txt
+ F:    Documentation/ia64/serial.rst
  F:    drivers/tty/serial/ioc?_serial.c
  F:    include/linux/ioc?.h
  
@@@ -14490,7 -14590,7 +14590,7 @@@ M:   Paul Walmsley <paul.walmsley@sifive.
  L:    [email protected]
  T:    git git://github.com/sifive/riscv-linux.git
  S:    Supported
- K:    sifive
+ K:    [^@]sifive
  N:    sifive
  
  SIFIVE FU540 SYSTEM-ON-CHIP
@@@ -14725,6 -14825,13 +14825,13 @@@ M: Chris Boot <[email protected]
  S:    Maintained
  F:    drivers/leds/leds-net48xx.c
  
+ SOFT-IWARP DRIVER (siw)
+ M:    Bernard Metzler <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/infiniband/sw/siw/
+ F:    include/uapi/rdma/siw-abi.h
  SOFT-ROCE DRIVER (rxe)
  M:    Moni Shoua <[email protected]>
  L:    [email protected]
@@@ -14774,6 -14881,7 +14881,7 @@@ F:   Documentation/devicetree/bindings/ne
  
  SOCIONEXT (SNI) NETSEC NETWORK DRIVER
  M:    Jassi Brar <[email protected]>
+ M:    Ilias Apalodimas <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/socionext/netsec.c
@@@ -14865,7 -14973,7 +14973,7 @@@ M:   Mattia Dongili <[email protected]
  L:    [email protected]
  W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
  S:    Maintained
- F:    Documentation/laptops/sony-laptop.txt
+ F:    Documentation/admin-guide/laptops/sony-laptop.rst
  F:    drivers/char/sonypi.c
  F:    drivers/platform/x86/sony-laptop.c
  F:    include/linux/sony-laptop.h
@@@ -15283,7 -15391,7 +15391,7 @@@ SVGA HANDLIN
  M:    Martin Mares <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/svga.txt
+ F:    Documentation/admin-guide/svga.rst
  F:    arch/x86/boot/video*
  
  SWIOTLB SUBSYSTEM
@@@ -15320,7 -15428,7 +15428,7 @@@ F:   drivers/dma-buf/dma-fence
  F:    drivers/dma-buf/sw_sync.c
  F:    include/linux/sync_file.h
  F:    include/uapi/linux/sync_file.h
- F:    Documentation/sync_file.txt
+ F:    Documentation/driver-api/sync_file.rst
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  SYNOPSYS ARC ARCHITECTURE
@@@ -15642,6 -15750,7 +15750,7 @@@ F:   include/media/i2c/tw9910.
  
  TEE SUBSYSTEM
  M:    Jens Wiklander <[email protected]>
+ L:    [email protected]
  S:    Maintained
  F:    include/linux/tee_drv.h
  F:    include/uapi/linux/tee.h
@@@ -15797,7 -15906,7 +15906,7 @@@ M:   Viresh Kumar <[email protected]
  M:    Javi Merino <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/thermal/cpu-cooling-api.txt
+ F:    Documentation/thermal/cpu-cooling-api.rst
  F:    drivers/thermal/cpu_cooling.c
  F:    include/linux/cpu_cooling.h
  
@@@ -15941,7 -16050,7 +16050,7 @@@ F:   sound/soc/codecs/isabelle
  TI LP855x BACKLIGHT DRIVER
  M:    Milo Kim <[email protected]>
  S:    Maintained
- F:    Documentation/backlight/lp855x-driver.txt
+ F:    Documentation/driver-api/backlight/lp855x-driver.rst
  F:    drivers/video/backlight/lp855x_bl.c
  F:    include/linux/platform_data/lp855x.h
  
@@@ -16205,7 -16314,7 +16314,7 @@@ M:   Greg Kroah-Hartman <gregkh@linuxfoun
  M:    Jiri Slaby <[email protected]>
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
- F:    Documentation/serial/
+ F:    Documentation/driver-api/serial/
  F:    drivers/tty/
  F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
@@@ -16745,7 -16854,7 +16854,7 @@@ W:   http://user-mode-linux.sourceforge.n
  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:    Documentation/virt/uml/
  F:    arch/um/
  F:    arch/x86/um/
  F:    fs/hostfs/
@@@ -16816,7 -16925,7 +16925,7 @@@ R:   Cornelia Huck <[email protected]
  L:    [email protected]
  T:    git git://github.com/awilliam/linux-vfio.git
  S:    Maintained
- F:    Documentation/vfio.txt
+ F:    Documentation/driver-api/vfio.rst
  F:    drivers/vfio/
  F:    include/linux/vfio.h
  F:    include/uapi/linux/vfio.h
@@@ -16825,7 -16934,7 +16934,7 @@@ VFIO MEDIATED DEVICE DRIVER
  M:    Kirti Wankhede <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/vfio-mediated-device.txt
+ F:    Documentation/driver-api/vfio-mediated-device.rst
  F:    drivers/vfio/mdev/
  F:    include/linux/mdev.h
  F:    samples/vfio-mdev/
@@@ -17013,6 -17122,13 +17122,13 @@@ S: Maintaine
  F:    drivers/virtio/virtio_input.c
  F:    include/uapi/linux/virtio_input.h
  
+ VIRTIO IOMMU DRIVER
+ M:    Jean-Philippe Brucker <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/iommu/virtio-iommu.c
+ F:    include/uapi/linux/virtio_iommu.h
  VIRTUAL BOX GUEST DEVICE DRIVER
  M:    Hans de Goede <[email protected]>
  M:    Arnd Bergmann <[email protected]>
@@@ -17064,7 -17180,8 +17180,8 @@@ S:   Maintaine
  F:    drivers/misc/vmw_balloon.c
  
  VMWARE HYPERVISOR INTERFACE
- M:    Alok Kataria <[email protected]>
+ M:    Thomas Hellstrom <[email protected]>
+ M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/x86/kernel/cpu/vmware.c
  W:    http://xfs.org/
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:    Supported
- F:    Documentation/filesystems/xfs.txt
+ F:    Documentation/admin-guide/xfs.rst
  F:    Documentation/ABI/testing/sysfs-fs-xfs
- F:    Documentation/filesystems/xfs.txt
  F:    Documentation/filesystems/xfs-delayed-logging-design.txt
  F:    Documentation/filesystems/xfs-self-describing-metadata.txt
  F:    fs/xfs/
@@@ -17700,7 -17816,7 +17816,7 @@@ R:   Sergey Senozhatsky <sergey.senozhats
  L:    [email protected]
  S:    Maintained
  F:    drivers/block/zram/
- F:    Documentation/blockdev/zram.txt
+ F:    Documentation/admin-guide/blockdev/zram.rst
  
  ZS DECSTATION Z85C30 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <[email protected]>
index e92725b2a46f6490eb134ce9e0ac348a0008d1d5,8282b8d41209898937c6effa51ce7fcfa13365d5..74e88e5edd9cf42792cd6e17fa4f5f516b91eff8
@@@ -35,8 -35,6 +35,8 @@@
  #include <asm/kvm_vcpu_regs.h>
  #include <asm/hyperv-tlfs.h>
  
 +#define __KVM_HAVE_ARCH_VCPU_DEBUGFS
 +
  #define KVM_MAX_VCPUS 288
  #define KVM_SOFT_MAX_VCPUS 240
  #define KVM_MAX_VCPU_ID 1023
@@@ -609,16 -607,15 +609,16 @@@ struct kvm_vcpu_arch 
  
        /*
         * QEMU userspace and the guest each have their own FPU state.
 -       * In vcpu_run, we switch between the user, maintained in the
 -       * task_struct struct, and guest FPU contexts. While running a VCPU,
 -       * the VCPU thread will have the guest FPU context.
 +       * In vcpu_run, we switch between the user and guest FPU contexts.
 +       * While running a VCPU, the VCPU thread will have the guest FPU
 +       * context.
         *
         * Note that while the PKRU state lives inside the fpu registers,
         * it is switched out separately at VMENTER and VMEXIT time. The
         * "guest_fpu" state here contains the guest FPU context, with the
         * host PRKU bits.
         */
 +      struct fpu *user_fpu;
        struct fpu *guest_fpu;
  
        u64 xcr0;
@@@ -1177,7 -1174,6 +1177,7 @@@ struct kvm_x86_ops 
        int (*update_pi_irte)(struct kvm *kvm, unsigned int host_irq,
                              uint32_t guest_irq, bool set);
        void (*apicv_post_state_restore)(struct kvm_vcpu *vcpu);
 +      bool (*dy_apicv_has_pending_interrupt)(struct kvm_vcpu *vcpu);
  
        int (*set_hv_timer)(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc,
                            bool *expired);
@@@ -1500,25 -1496,29 +1500,29 @@@ enum 
  #define kvm_arch_vcpu_memslots_id(vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0)
  #define kvm_memslots_for_spte_role(kvm, role) __kvm_memslots(kvm, (role).smm)
  
+ asmlinkage void __noreturn kvm_spurious_fault(void);
  /*
   * Hardware virtualization extension instructions may fault if a
   * reboot turns off virtualization while processes are running.
-  * Trap the fault and ignore the instruction if that happens.
+  * Usually after catching the fault we just panic; during reboot
+  * instead the instruction is ignored.
   */
- asmlinkage void kvm_spurious_fault(void);
- #define ____kvm_handle_fault_on_reboot(insn, cleanup_insn)    \
-       "666: " insn "\n\t" \
-       "668: \n\t"                           \
-       ".pushsection .fixup, \"ax\" \n" \
-       "667: \n\t" \
-       cleanup_insn "\n\t"                   \
-       "cmpb $0, kvm_rebooting \n\t"         \
-       "jne 668b \n\t"                       \
-       __ASM_SIZE(push) " $666b \n\t"        \
-       "jmp kvm_spurious_fault \n\t"         \
-       ".popsection \n\t" \
-       _ASM_EXTABLE(666b, 667b)
+ #define ____kvm_handle_fault_on_reboot(insn, cleanup_insn)            \
+       "666: \n\t"                                                     \
+       insn "\n\t"                                                     \
+       "jmp    668f \n\t"                                              \
+       "667: \n\t"                                                     \
+       "call   kvm_spurious_fault \n\t"                                \
+       "668: \n\t"                                                     \
+       ".pushsection .fixup, \"ax\" \n\t"                              \
+       "700: \n\t"                                                     \
+       cleanup_insn "\n\t"                                             \
+       "cmpb   $0, kvm_rebooting\n\t"                                  \
+       "je     667b \n\t"                                              \
+       "jmp    668b \n\t"                                              \
+       ".popsection \n\t"                                              \
+       _ASM_EXTABLE(666b, 700b)
  
  #define __kvm_handle_fault_on_reboot(insn)            \
        ____kvm_handle_fault_on_reboot(insn, "")
diff --combined arch/x86/kernel/kvm.c
index edd2179ad2da38393aefadad8c7db2140b857df2,b7f34fe2171e472f7f64bf7f93c9bdfcaefba710..4ab377c9fffede8af8c93b620bdb9d90803fd353
@@@ -242,23 -242,23 +242,23 @@@ EXPORT_SYMBOL_GPL(kvm_read_and_reset_pf
  NOKPROBE_SYMBOL(kvm_read_and_reset_pf_reason);
  
  dotraplinkage void
- do_async_page_fault(struct pt_regs *regs, unsigned long error_code)
+ do_async_page_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
  {
        enum ctx_state prev_state;
  
        switch (kvm_read_and_reset_pf_reason()) {
        default:
-               do_page_fault(regs, error_code);
+               do_page_fault(regs, error_code, address);
                break;
        case KVM_PV_REASON_PAGE_NOT_PRESENT:
                /* page is swapped out by the host. */
                prev_state = exception_enter();
-               kvm_async_pf_task_wait((u32)read_cr2(), !user_mode(regs));
+               kvm_async_pf_task_wait((u32)address, !user_mode(regs));
                exception_exit(prev_state);
                break;
        case KVM_PV_REASON_PAGE_READY:
                rcu_irq_enter();
-               kvm_async_pf_task_wake((u32)read_cr2());
+               kvm_async_pf_task_wake((u32)address);
                rcu_irq_exit();
                break;
        }
@@@ -308,6 -308,9 +308,6 @@@ static notrace void kvm_guest_apic_eoi_
  
  static void kvm_guest_cpu_init(void)
  {
 -      if (!kvm_para_available())
 -              return;
 -
        if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF) && kvmapf) {
                u64 pa = slow_virt_to_phys(this_cpu_ptr(&apf_reason));
  
@@@ -622,6 -625,9 +622,6 @@@ static void __init kvm_guest_init(void
  {
        int i;
  
 -      if (!kvm_para_available())
 -              return;
 -
        paravirt_ops_setup();
        register_reboot_notifier(&kvm_pv_reboot_nb);
        for (i = 0; i < KVM_TASK_SLEEP_HASHSIZE; i++)
@@@ -832,6 -838,7 +832,7 @@@ asm
  "cmpb $0, " __stringify(KVM_STEAL_TIME_preempted) "+steal_time(%rax);"
  "setne        %al;"
  "ret;"
+ ".size __raw_callee_save___kvm_vcpu_is_preempted, .-__raw_callee_save___kvm_vcpu_is_preempted;"
  ".popsection");
  
  #endif
   */
  void __init kvm_spinlock_init(void)
  {
 -      if (!kvm_para_available())
 -              return;
        /* Does host kernel support KVM_FEATURE_PV_UNHALT? */
        if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
                return;
diff --combined virt/kvm/arm/arm.c
index 13f5a1aa6d794dda23740b366ce55c6c435ade54,c704fa6961844b924ea1a2e2a43382ad16773ed8..3f7bea930acff3f6cb5e3d5273385eca31645e44
@@@ -144,6 -144,11 +144,6 @@@ out_fail_alloc
        return ret;
  }
  
 -bool kvm_arch_has_vcpu_debugfs(void)
 -{
 -      return false;
 -}
 -
  int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu)
  {
        return 0;
@@@ -335,6 -340,8 +335,8 @@@ int kvm_arch_vcpu_init(struct kvm_vcpu 
        /* Set up the timer */
        kvm_timer_vcpu_init(vcpu);
  
+       kvm_pmu_vcpu_init(vcpu);
        kvm_arm_reset_debug_ptr(vcpu);
  
        return kvm_vgic_vcpu_init(vcpu);
@@@ -722,7 -729,7 +724,7 @@@ int kvm_arch_vcpu_ioctl_run(struct kvm_
                 * Ensure we set mode to IN_GUEST_MODE after we disable
                 * interrupts and before the final VCPU requests check.
                 * See the comment in kvm_vcpu_exiting_guest_mode() and
 -               * Documentation/virtual/kvm/vcpu-requests.rst
 +               * Documentation/virt/kvm/vcpu-requests.rst
                 */
                smp_store_mb(vcpu->mode, IN_GUEST_MODE);
  
This page took 0.182059 seconds and 4 git commands to generate.