1. 19 Oct, 2017 9 commits
    • Arnd Bergmann's avatar
      Merge tag 'aspeed-4.15-devicetree' of... · b966bb45
      Arnd Bergmann authored
      Merge tag 'aspeed-4.15-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/soc
      
      Pull "ASPEED devicetree updates for 4.15" from Joel Stanley:
      
       - Cleanups of the ASPEED device trees
       - Enable the i2c bus on all platforms
       - Turn VUART on for BMC platforms
       - Bind watchdog two for compatilbiy with shipping u-boot
      
      * tag 'aspeed-4.15-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
        ARM: dts: aspeed-romulus: Enable VUART
        ARM: dts: aspeed-palmetto: Enable VUART
        ARM: dts: aspeed: Enable watchdog two
        ARM: dts: aspeed: Remove undocumented wdt properties
        ARM: dts: aspeed: Clean up UART nodes
        ARM: dts: aspeed: Correctly order UART nodes
        ARM: dts: aspeed: Add aliases for UARTs
        ARM: dts: aspeed-ast2500: Add I2C devices
        ARM: dts: aspeed-palmetto: Add I2C devices
        ARM: dts: aspeed-romulus: Add I2C devices
        ARM: dts: aspeed: Add I2C buses
        ARM: dts: aspeed: Reorder ADC node
        ARM: dts: aspeed: Move pinctrl subnodes to improve readability
      b966bb45
    • Arnd Bergmann's avatar
      Merge tag 'socfpga_dts_for_v4.15_part1' of... · 9d2e8198
      Arnd Bergmann authored
      Merge tag 'socfpga_dts_for_v4.15_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/soc
      
      Pull "SoCFPGA DTS updates for v4.15" from Dinh Nguyen:
      - Stratix10 platform updates
        - Fix up gic register entry
        - Enable ethernet/SDMMC
        - Update reset manager properties
      
      * tag 'socfpga_dts_for_v4.15_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
        arm64: dts: stratix10: add reset property for various peripherals
        arm64: dts: stratix10: add the 'altr,modrst-off' property
        arm64: dts: stratix10: include the reset manager bindings
        arm64: dts: stratix10: add ethernet/sdmmc support to the S10 devkit
        arm64: dts: stratix10: fix up the gic register for the Stratix10 platform
      9d2e8198
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt-for-v4.15' of... · 063f7c82
      Arnd Bergmann authored
      Merge tag 'renesas-dt-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
      
      Pull "Renesas ARM Based SoC DT Updates for v4.15" from Simon Horman:
      
      * r7s72100 (RZ/A1) Peach board
        - Add pin groups for SCIF2 serial debug interface and Ethernet
          This avoids relying on bootloader settings
        - Support control of LED1 using gpio-leds
      
      * r8a7743 (RZ/G1M) and r8a7745 (RZ/G1E) SoCs
        - Add MSIOF[012] support and define aliases for spi[0123]
      
      * r8a7743 (RZ/G1M) SoC
        - Add I2C and IIC core nodes
      
      * r8a7743 (RZ/G1M) iW-RainboW-G20D-Qseven development platform
         - Enable SDHI1 SD controller supporting high-speed and SDR50 transfers
         - Add chosen node to allow correct selection of serial console
           and the kernel command line
         - Enable RTC support
         - Enable USB2.0 host support
           This includes enabling USB PHY and internal PCI
      
      * r8a7743 (RZ/G1M) iW-RainboW-G20M-Qseven and
        r8a7745 (RZ/G1E) iW-RainboW-G22M-SM SoMs
         - Enable Add SPI NOR support
           This devices is used to boot up the system to the SoM DT
      
      * r8a7743 (RZ/G1M) iW-RainboW-G20M-Qseven SoM
        - Enable SDHI0 SD controller supporting high-speed transfers
      
      * r8a7745 (RZ/G1E) iW-RainboW-G22D development platform
        - Add pnctl support for scif4
          This avoids reling on boot loader settings
        - Add EtherAVB support
      
      * r8a7745 (RZ/G1E) iW-RainboW-G22M-SM SoM
        - Add basic SoM support
        - Enable MMCIF eMMC support
        - Enable RTC support
        - Enable SDHI1 SD controller supporting high-speed transfers
      
      * r8a779[0-4] R-Car Gen2 SoCs
        - Add reset control properties
          Geert Uytterhoeven says:
      
          This patch series describes the reset topology on all R-Car Gen2 Socs,
          like was done before for R-Car Gen3 and RZ/G1.
      
          Resets usually match the corresponding module clocks.  Exceptions are:
            - The audio module has resets for the Serial Sound Interfaces only,
            - The display module has only a single reset for all DU channels, but
      	adding reset properties for the display is postponed upon request
      	from Laurent.
      
         - Convert to new CPG/MSSR bindings
           Geert Uytterhoven says:
      
           Currently Renesas R-Car Gen2 SoCs use the common clk-rcar-gen2,
           clk-mstp, and clk-div6 drivers, which depend on most clocks being
           described in DT.  Especially the module (MSTP) clocks are cumbersome
           and error prone, due to 3 arrays (clocks, clock-indices, and
           clock-output-names) to be kept in sync. In addition, the clk-mstp
           driver cannot be extended easily to also support module resets, which
           are provided by the same hardware module.
      
           Hence when developing support for R-Car Gen3 SoCs, another approach
           was chosen, which led to the CPG/MSSR driver core, and SoC-specific
           subdrivers (initially for R-Car Gen3, but later also for RZ/G1).
      
           This series converts the various R-Car Gen2 DTSes to migrate to the
           new CPG/MSSR drivers that were added in v4.13-rc1.
      
      * r8a779[0,1,3,4] R-Car Gen2 SoCs
        - Stop grouping clocks under a "clocks" subnode
          Geert Uytterhoeven says:
      
          The current practice is to not group clocks under a "clocks" subnode,
          but just put them together with the other on-SoC devices.
      
          Hence this patch series implements this for the various R-Car Gen2
          DTSes that still need this (r8a7792.dtsi is OK).
      
      * r8a7794 (E2) Alt board
        - Correct inverted sense of SD wip pins
      
      * tag 'renesas-dt-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (48 commits)
        ARM: dts: r8a7743: Add MSIOF[012] support
        ARM: dts: r8a7745: Add MSIOF[012] support
        ARM: dts: iwg22d: Enable SDHI0 controller
        ARM: dts: iwg22m: Add SPI NOR support
        ARM: dts: r8a7745: Add QSPI support
        ARM: dts: iwg20m: Add SPI NOR support
        ARM: dts: r8a7743: Add QSPI support
        ARM: dts: iwg22m: Enable SDHI1 controller
        ARM: dts: r8a7745: Add SDHI controllers
        ARM: dts: r8a7794: Add reset control properties
        ARM: dts: r8a7793: Add reset control properties
        ARM: dts: r8a7792: Add reset control properties
        ARM: dts: r8a7791: Add reset control properties
        ARM: dts: r8a7790: Add reset control properties
        ARM: dts: r8a7743: Add IIC cores to dtsi
        ARM: dts: alt: use correct logic for SD WP pins
        ARM: dts: iwg20d-q7: Enable USB PHY
        ARM: dts: iwg20d-q7: Enable internal PCI
        ARM: dts: r8a7743: Link PCI USB devices to USB PHY
        ARM: dts: r8a7743: Add USB PHY DT support
        ...
      063f7c82
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt-bindings-for-v4.15' of... · c305cf33
      Arnd Bergmann authored
      Merge tag 'renesas-dt-bindings-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
      
      Pull "Renesas ARM Based SoC DT Bindings Updates for v4.15" from Simon Horman:
      
      * Consistently do not use ';' in documentation of compat strings
        for boards. A misture of using and not using a trailing ';' had
        krept in over time with not using being dominant.
      
      * Document bindings for
        - Eagle board and r8a77970 (V3M) SoC bindings.
          Eagle is a board for the V3M SoC
        - Document Kingfisher board bindings.
          Kingfisher is an extension board for the H3ULCB and M3ULCB boards.
      
      * Add r8a77970 (V3M) SYSC power domain definitions
      
        Add macros usable by the device tree sources to reference r8a77970 SYSC
        power domains by index.
      
      * Add Renesas SoC DT bindings doc to Renesas ARM section of MAINTAINERS file
      
      * Drop bogus node name suffix from example of /renesas,dw-hdmi binding
      
      * Document APMU and SMP enable method for r8a7745 (RZ/G1E) SoC
      
      * tag 'renesas-dt-bindings-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: remove inconsistent ; from documentation
        arm64: renesas: document Eagle board bindings
        arm: shmobile: Document Kingfisher board DT bindings
        dt-bindings: power: add R8A77970 SYSC power domain definitions
        MAINTAINERS: Add Renesas SoC DT bindings doc to Renesas ARM sections
        ARM: shmobile: Document R-Car V3M SoC DT bindings
        dt-bindings: display: renesas: dw-hdmi: Drop bogus node name suffix
        dt-bindings: apmu: Document r8a7745 support
      c305cf33
    • Arnd Bergmann's avatar
      Merge tag 'renesas-arm64-dt-for-v4.15' of... · 025792ca
      Arnd Bergmann authored
      Merge tag 'renesas-arm64-dt-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
      
      Pull "Renesas ARM64 Based SoC DT Updates for v4.15" from Simon Horman:
      
      * r8a7795 (H3)
        - Use r8a7795-cpg-mssr and r8a7795-sysc bindings
          Hardcoded indicies are replaced with symbols now that they are available
      
        - Drop bogus HDMI node name suffixes
          Laurent Pinchart says: Node names should not use numerical suffixes if
          the nodes can be distinguished by unit-address
      
        - Update PFC node name to pin-controller
          Shimoda-san says the PFC node name is changed "from e6060000.pfc and
          pfc@e6060000 to e6060000.pin-controller and pin-controller@e6060000
          like other Renesas SoCs."
      
      * r8a7795 (H3) ES1.0
        - Drop extra zero from XHCI unit address
          This corrects a typo were ee0400000 rather than ee040000 was used
          as the unit address.
      
      * r8a7796 (M3-W)
        - Add FDP1 instance
          Laurent Pinchart says: The r8a7796 has a single FDP1 instance.
      
      * r8a7795 (H3) and r8a7796 (M3-W) SoCs
        - Add USB3.0 peripheral device nodes
          Shimoda-san says that this is not enabled on the Salvator-X/XS boards
          for now as:
           + we need a special cable (USB type-A to A cross cable).
           + we can swap the role by renesas_usb3 driver even if we use a normal
      	cable and after usb3.0 host is running, but I think it's a special
      	use case.
      
      * r8a7795 (H3) and r8a7796 (M3-W) ULCB boards
        - Enable display output
          Laurent Pinchart says: The DU is already wired up to the HDMI encoder,
          all we need to do is enable it.
      
      * r8a77995 (D3) Draak board
        - Enable EthernetAVB and , USB2.0 Host and PHY
      
        - Add serial console pins.
          This is safe to do now that r8a77995 PFC driver support is present
      
      * r8a77970 (V3M)
        - Add basic support for SoC and EtherAVB, [H]SCIF and SYS-DMAC nodes
          This is a step towards enabling EtherAVB and [H]SCIF with SYS-DMAC
          in the Eagle board support for which is under review
      
      * tag 'renesas-arm64-dt-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (22 commits)
        arm64: dts: renesas: r8a7796: add USB3.0 peripheral device node
        arm64: dts: renesas: r8a7795: add USB3.0 peripheral device node
        arm64: dts: renesas: r8a77995: draak: enable EthernetAVB
        arm64: dts: renesas: r8a77995: draak: enable USB2.0 Host (EHCI/OHCI)
        arm64: dts: renesas: r8a77995: draak: enable USB2.0 PHY
        arm64: dts: renesas: r8a77995: add USB2.0 Host (EHCI/OHCI) device node
        arm64: dts: renesas: r8a77995: Add USB2.0 PHY device node
        arm64: dts: draak: Add serial console pins
        arm64: dts: renesas: r8a77970: add EtherAVB support
        arm64: dts: renesas: r8a77970: add [H]SCIF support
        arm64: dts: renesas: r8a77970: add SYS-DMAC support
        arm64: dts: renesas: initial R8A77970 SoC device tree
        arm64: dts: renesas: r8a77995: Add EthernetAVB device node
        arm64: dts: renesas: r8a77995: add GPIO device nodes
        arm64: dts: renesas: r8a77995: Use r8a7795-cpg-mssr binding definitions
        arm64: dts: renesas: r8a77995: Use r8a7795-sysc binding definitions
        arm64: renesas: Add Renesas R8A77970 Kconfig support
        arm64: dts: renesas: r8a7795: Drop bogus HDMI node names suffixes
        arm64: dts: renesas: ulcb: Enable display output
        arm64: dts: renesas: r8a77995: update PFC node name to pin-controller
        ...
      025792ca
    • Arnd Bergmann's avatar
      Merge tag 'integrator-pciv3-dts' of... · 400f170d
      Arnd Bergmann authored
      Merge tag 'integrator-pciv3-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc
      
      Pull "DTS updates for the Integrator PCIv3 driver" from Linus Walleij:
      
      These are the DTS file changes required to fix bugs and satisfy
      requirements for the new PCIv3 driver in the PCI subsystem.
      The binding changes have been merged to the PCI tree.
      
      [arnd] Note: this is an incompatible DT binding change, so things
             will break during bisection or when using an old dtb file.
             Since integrator has no real users, we can make an exception
             for that.
      
      * tag 'integrator-pciv3-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
        ARM: dts: Update Integrator/AP PCI v3 compatible
        ARM: dts: integratorap: Fix PCI windows
        ARM: dts: add the PCI clock to the device tree
      400f170d
    • Rob Herring's avatar
      arm64: dts: fix unit-address leading 0s · d8bcaabe
      Rob Herring authored
      Fix dtc warnings for 'simple_bus_reg' due to leading 0s. Converted using
      the following command:
      
      perl -p -i -e 's/\@0+([0-9a-f])/\@$1/g' `find arch/arm64/boot/dts -type -f -name '*.dts*'
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      d8bcaabe
    • Rob Herring's avatar
      arm: dts: fix unit-address leading 0s · 8dccafaa
      Rob Herring authored
      Fix dtc warnings for 'simple_bus_reg' due to leading 0s. Converted using
      the following command:
      
      perl -p -i -e 's/\@0+([0-9a-f])/\@$1/g' `find arch/arm/boot/dts -type -f -name '*.dts*'
      
      Dropped changes to ARM, Ltd. boards LED nodes and manually fixed up some
      occurrences of uppercase hex.
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      8dccafaa
    • Surender Polsani's avatar
      arm: boot: dts: artpec6: Remove unnecessary interrupt-parent property from sub-nodes · 59b63087
      Surender Polsani authored
      "interrupt-parent" property is declared in root node, so it is global
      to all nodes. This property is re-declared in few sub-nodes. To avoid
      duplication this property is removed from following sub-nodes:
      pmu, amba@0, amba@0/ethernet.
      Signed-off-by: default avatarSurender Polsani <surenderp@techveda.org>
      Acked-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      59b63087
  2. 09 Oct, 2017 1 commit
  3. 07 Oct, 2017 4 commits
  4. 06 Oct, 2017 20 commits
    • Linus Torvalds's avatar
      Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · dbeb1a8f
      Linus Torvalds authored
      Pull clk fixes from Stephen Boyd:
      
       - build fix to export the clk_bulk_prepare() symbol
      
       - suspend fix for Samsung Exynos SoCs where we need to keep clks on
         across suspend
      
       - two critical clk markings for clks that shouldn't ever turn off on
         Rockchip SoCs
      
       - a fix for a copy-paste mistake on Rockchip rk3128 causing some clks
         to touch the same bit and trample over one another
      
      * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
        clk: samsung: exynos4: Enable VPLL and EPLL clocks for suspend/resume cycle
        clk: Export clk_bulk_prepare()
        clk: rockchip: add sclk_timer5 as critical clock on rk3128
        clk: rockchip: fix up rk3128 pvtm and mipi_24m gate regs error
        clk: rockchip: add pclk_pmu as critical clock on rk3128
      dbeb1a8f
    • Linus Torvalds's avatar
      Merge tag 'arc-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · ed0f72f4
      Linus Torvalds authored
      Pull ARC udpates from Vineet Gupta:
      
       - updates for various platforms
      
       - boot log updates for upcoming HS48 family of cores (dual issue)
      
      * tag 'arc-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: [plat-hsdk]: Add reset controller node to manage ethernet reset
        ARC: [plat-hsdk]: Temporary fix to set CPU frequency to 1GHz
        ARC: fix allnoconfig build warning
        ARCv2: boot log: identify HS48 cores (dual issue)
        ARC: boot log: decontaminate ARCv2 ISA_CONFIG register
        arc: remove redundant UTS_MACHINE define in arch/arc/Makefile
        ARC: [plat-eznps] Update platform maintainer as Noam left
        ARC: [plat-hsdk] use actual clk driver to manage cpu clk
        ARC: [*defconfig] Reenable soft lock-up detector
        ARC: [plat-axs10x] sdio: Temporary fix of sdio ciu frequency
        ARC: [plat-hsdk] sdio: Temporary fix of sdio ciu frequency
        ARC: [plat-axs103] Add temporary quirk to reset ethernet IP
      ed0f72f4
    • Linus Torvalds's avatar
      Merge tag 'xfs-4.14-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · eab26ad1
      Linus Torvalds authored
      Pull xfs fixes from Darrick Wong:
      
       - fix a race between overlapping copy on write aio
      
       - fix cow fork swapping when we defragment reflinked files
      
      * tag 'xfs-4.14-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: handle racy AIO in xfs_reflink_end_cow
        xfs: always swap the cow forks when swapping extents
      eab26ad1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 17d084c8
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "A collection of fixes for this series. This contains:
      
         - NVMe pull request from Christoph, one uuid attribute fix, and one
           fix for the controller memory buffer address for remapped BARs.
      
         - use-after-free fix for bsg, from Benjamin Block.
      
         - bcache race/use-after-free fix for a list traversal, fixing a
           regression in this merge window. From Coly Li.
      
         - null_blk change configfs dependency change from a 'depends' to a
           'select'. This is a change from this merge window as well. From me.
      
         - nbd signal fix from Josef, fixing a regression introduced with the
           status code changes.
      
         - nbd MAINTAINERS mailing list entry update.
      
         - blk-throttle stall fix from Joseph Qi.
      
         - blk-mq-debugfs fix from Omar, fixing an issue where we don't
           register the IO scheduler debugfs directory, if the driver is
           loaded with it. Only shows up if you switch through the sysfs
           interface"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        bsg-lib: fix use-after-free under memory-pressure
        nvme-pci: Use PCI bus address for data/queues in CMB
        blk-mq-debugfs: fix device sched directory for default scheduler
        null_blk: change configfs dependency to select
        blk-throttle: fix possible io stall when upgrade to max
        MAINTAINERS: update list for NBD
        nbd: fix -ERESTARTSYS handling
        nvme: fix visibility of "uuid" ns attribute
        bcache: use llist_for_each_entry_safe() in __closure_wake_up()
      17d084c8
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.14-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 80cf1f8c
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
       "Fix legacy IDE probe issues exposed by recent PCI core IRQ mapping
        changes (Bartlomiej Zolnierkiewicz, Lorenzo Pieralisi)"
      
      * tag 'pci-v4.14-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        ide: fix IRQ assignment for PCI bus order probing
        ide: pci: free PCI BARs on initialization failure
        ide: free hwif->portdev on hwif_init() failure
      80cf1f8c
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 27549068
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
      
       - Bring initialisation of user space undefined instruction handling
         early (core_initcall) since late_initcall() happens after modprobe in
         initramfs is invoked. Similar fix for fpsimd initialisation
      
       - Increase the kernel stack when KASAN is enabled
      
       - Bring the PCI ACS enabling earlier via the
         iort_init_platform_devices()
      
       - Fix misleading data abort address printing (decimal vs hex)
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: Ensure fpsimd support is ready before userspace is active
        arm64: Ensure the instruction emulation is ready for userspace
        arm64: Use larger stacks when KASAN is selected
        ACPI/IORT: Fix PCI ACS enablement
        arm64: fix misleading data abort decoding
      27549068
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 8d473320
      Linus Torvalds authored
      Pull KVM fixes from Radim Krčmář:
      
       - fix PPC XIVE interrupt delivery
      
       - fix x86 RCU breakage from asynchronous page faults when built without
         PREEMPT_COUNT
      
       - fix x86 build with -frecord-gcc-switches
      
       - fix x86 build without X86_LOCAL_APIC
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: add X86_LOCAL_APIC dependency
        x86/kvm: Move kvm_fastop_exception to .fixup section
        kvm/x86: Avoid async PF preempting the kernel incorrectly
        KVM: PPC: Book3S: Fix server always zero from kvmppc_xive_get_xive()
      8d473320
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · d109d83f
      Linus Torvalds authored
      Pull rdma fixes from Doug Ledford:
       "This is a pretty small pull request. Only 6 patches in total. There
        are no outstanding -rc patches on the mailing list after this pull
        request, so only if some new issues are discovered in the remainder of
        the rc cycles will you hear from me again.
      
        Summary:
         - a fix for iwpm netlink usage
         - a fix for error unwinding in mlx5
         - two fixes to vlan handling in qedr
         - a couple small i40iw fixes"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        i40iw: Fix port number for query QP
        i40iw: Add missing memory barriers
        RDMA/qedr: Parse vlan priority as sl
        RDMA/qedr: Parse VLAN ID correctly and ignore the value of zero
        IB/mlx5: Fix label order in error path handling
        RDMA/iwpm: Properly mark end of NL messages
      d109d83f
    • Linus Torvalds's avatar
      Merge branch 'for-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · bf2db0b9
      Linus Torvalds authored
      Pull btrfs fixes from David Sterba:
       "Two more fixes for bugs introduced in 4.13.
      
        The sector_t problem with 32bit architecture and !LBDAF config seems
        serious but the number of affected deployments is hopefully low.
      
        The clashing status bits could lead to a confusing in-memory state of
        the whole-filesystem operations if used with the quota override sysfs
        knob"
      
      * 'for-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        Btrfs: fix overlap of fs_info::flags values
        btrfs: avoid overflow when sector_t is 32 bit
      bf2db0b9
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client · b77779b9
      Linus Torvalds authored
      Pull ceph fixes from Ilya Dryomov:
       "Two fixups for CephFS snapshot-handling patches in -rc1"
      
      * tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client:
        ceph: fix __choose_mds() for LSSNAP request
        ceph: properly queue cap snap for newly created snap realm
      b77779b9
    • Eugeniy Paltsev's avatar
      ARC: [plat-hsdk]: Add reset controller node to manage ethernet reset · ab8eb7db
      Eugeniy Paltsev authored
      DW ethernet controller on HSDK hangs sometimes after SW reset, so
      add reset node to make possible to reset DW ethernet controller HW.
      Signed-off-by: default avatarEugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      ab8eb7db
    • Linus Torvalds's avatar
      Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 8d4ef4e1
      Linus Torvalds authored
      Pull overlayfs fixes from Miklos Szeredi:
       "Fix a regression in 4.14 and one in 4.13. The latter is a case when
        Docker is doing something it really shouldn't and gets away with it.
        We now print a warning instead of erroring out.
      
        There are also fixes to several error paths"
      
      * 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: fix regression caused by exclusive upper/work dir protection
        ovl: fix missing unlock_rename() in ovl_do_copy_up()
        ovl: fix dentry leak in ovl_indexdir_cleanup()
        ovl: fix dput() of ERR_PTR in ovl_cleanup_index()
        ovl: fix error value printed in ovl_lookup_index()
        ovl: fix may_write_real() for overlayfs directories
      8d4ef4e1
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 1249b571
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       "Nine small fixes, really nothing that stands out.
      
        A work-around for a spurious MCE on Power9. A CXL fault handling fix,
        some fixes to the new XIVE code, and a fix to the new 32-bit
        STRICT_KERNEL_RWX code.
      
        Fixes for old code/stable: an fix to an incorrect TLB flush on boot
        but not on any current machines, a compile error on 4xx and a fix to
        memory hotplug when using radix (Power9).
      
        Thanks to: Anton Blanchard, Cédric Le Goater, Christian Lamparter,
        Christophe Leroy, Christophe Lombard, Guenter Roeck, Jeremy Kerr,
        Michael Neuling, Nicholas Piggin"
      
      * tag 'powerpc-4.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/powernv: Increase memory block size to 1GB on radix
        powerpc/mm: Call flush_tlb_kernel_range with interrupts enabled
        powerpc/xive: Clear XIVE internal structures when a CPU is removed
        powerpc/xive: Fix IPI reset
        powerpc/4xx: Fix compile error with 64K pages on 40x, 44x
        powerpc: Fix action argument for cpufeatures-based TLB flush
        cxl: Fix memory page not handled
        powerpc: Fix workaround for spurious MCE on POWER9
        powerpc: Handle MCE on POWER9 with only DSISR bit 30 set
      1249b571
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.14-rc4' of git://people.freedesktop.org/~airlied/linux · 9c0c1ada
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Some i915 fixes from the last two weeks (as they were on a strange
        base and I just waited for rc3), also a single sun4i hdmi fix"
      
      * tag 'drm-fixes-for-v4.14-rc4' of git://people.freedesktop.org/~airlied/linux:
        drm/i915/glk: Fix DMC/DC state idleness calculation
        drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume
        drm/i915: Fix DDI PHY init if it was already on
        drm/sun4i: hdmi: Disable clks in bind function error path and unbind function
        drm/i915/bios: ignore HDMI on port A
        drm/i915: remove redundant variable hw_check
        drm/i915: always update ELD connector type after get modes
      9c0c1ada
    • Linus Torvalds's avatar
      Merge branch 'core-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 27efed3e
      Linus Torvalds authored
      Pull watchddog clean-up and fixes from Thomas Gleixner:
       "The watchdog (hard/softlockup detector) code is pretty much broken in
        its current state. The patch series addresses this by removing all
        duct tape and refactoring it into a workable state.
      
        The reasons why I ask for inclusion that late in the cycle are:
      
         1) The code causes lockdep splats vs. hotplug locking which get
            reported over and over. Unfortunately there is no easy fix.
      
         2) The risk of breakage is minimal because it's already broken
      
         3) As 4.14 is a long term stable kernel, I prefer to have working
            watchdog code in that and the lockdep issues resolved. I wouldn't
            ask you to pull if 4.14 wouldn't be a LTS kernel or if the
            solution would be easy to backport.
      
         4) The series was around before the merge window opened, but then got
            delayed due to the UP failure caused by the for_each_cpu()
            surprise which we discussed recently.
      
        Changes vs. V1:
      
         - Addressed your review points
      
         - Addressed the warning in the powerpc code which was discovered late
      
         - Changed two function names which made sense up to a certain point
           in the series. Now they match what they do in the end.
      
         - Fixed a 'unused variable' warning, which got not detected by the
           intel robot. I triggered it when trying all possible related config
           combinations manually. Randconfig testing seems not random enough.
      
        The changes have been tested by and reviewed by Don Zickus and tested
        and acked by Micheal Ellerman for powerpc"
      
      * 'core-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
        watchdog/core: Put softlockup_threads_initialized under ifdef guard
        watchdog/core: Rename some softlockup_* functions
        powerpc/watchdog: Make use of watchdog_nmi_probe()
        watchdog/core, powerpc: Lock cpus across reconfiguration
        watchdog/core, powerpc: Replace watchdog_nmi_reconfigure()
        watchdog/hardlockup/perf: Fix spelling mistake: "permanetely" -> "permanently"
        watchdog/hardlockup/perf: Cure UP damage
        watchdog/hardlockup: Clean up hotplug locking mess
        watchdog/hardlockup/perf: Simplify deferred event destroy
        watchdog/hardlockup/perf: Use new perf CPU enable mechanism
        watchdog/hardlockup/perf: Implement CPU enable replacement
        watchdog/hardlockup/perf: Implement init time detection of perf
        watchdog/hardlockup/perf: Implement init time perf validation
        watchdog/core: Get rid of the racy update loop
        watchdog/core, powerpc: Make watchdog_nmi_reconfigure() two stage
        watchdog/sysctl: Clean up sysctl variable name space
        watchdog/sysctl: Get rid of the #ifdeffery
        watchdog/core: Clean up header mess
        watchdog/core: Further simplify sysctl handling
        watchdog/core: Get rid of the thread teardown/setup dance
        ...
      27efed3e
    • Suzuki K Poulose's avatar
      arm64: Ensure fpsimd support is ready before userspace is active · ae2e972d
      Suzuki K Poulose authored
      We register the pm/hotplug callbacks for FPSIMD as late_initcall,
      which happens after the userspace is active (from initramfs via
      populate_rootfs, a rootfs_initcall). Make sure we are ready even
      before the userspace could potentially use it, by promoting to
      a core_initcall.
      
      Cc: Will Deacon <will.deacon@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Dave Martin <dave.martin@arm.com>
      Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      ae2e972d
    • Suzuki K Poulose's avatar
      arm64: Ensure the instruction emulation is ready for userspace · c0d8832e
      Suzuki K Poulose authored
      We trap and emulate some instructions (e.g, mrs, deprecated instructions)
      for the userspace. However the handlers for these are registered as
      late_initcalls and the userspace could be up and running from the initramfs
      by that time (with populate_rootfs, which is a rootfs_initcall()). This
      could cause problems for the early applications ending up in failure
      like :
      
      [   11.152061] modprobe[93]: undefined instruction: pc=0000ffff8ca48ff4
      
      This patch promotes the specific calls to core_initcalls, which are
      guaranteed to be completed before we hit userspace.
      
      Cc: stable@vger.kernel.org
      Cc: Dave Martin <dave.martin@arm.com>
      Cc: Matthias Brugger <mbrugger@suse.com>
      Cc: James Morse <james.morse@arm.com>
      Reported-by: default avatarMatwey V. Kornilov <matwey.kornilov@gmail.com>
      Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      c0d8832e
    • Anton Blanchard's avatar
      powerpc/powernv: Increase memory block size to 1GB on radix · 53ecde0b
      Anton Blanchard authored
      Memory hot unplug on PowerNV radix hosts is broken. Our memory block
      size is 256MB but since we map the linear region with very large
      pages, each pte we tear down maps 1GB.
      
      A hot unplug of one 256MB memory block results in 768MB of memory
      getting unintentionally unmapped. At this point we are likely to oops.
      
      Fix this by increasing our memory block size to 1GB on PowerNV radix
      hosts.
      
      Fixes: 4b5d62ca ("powerpc/mm: add radix__remove_section_mapping()")
      Cc: stable@vger.kernel.org # v4.11+
      Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      53ecde0b
    • Dave Airlie's avatar
      Merge tag 'drm-misc-fixes-2017-10-05' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes · baf7c1f7
      Dave Airlie authored
      One bugfix in sun4i for 4.14
      
      * tag 'drm-misc-fixes-2017-10-05' of git://anongit.freedesktop.org/git/drm-misc:
        drm/sun4i: hdmi: Disable clks in bind function error path and unbind function
      baf7c1f7
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2017-10-04' of... · 00bb09c4
      Dave Airlie authored
      Merge tag 'drm-intel-fixes-2017-10-04' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes
      
      drm/i915 fixes for 4.14-rc4:
      
      All 3 highest GLK bugs fixed by Imre:
      - GLK drv reload - Fix DDI Phy init if it was already on.
      - GLK suspend resume - Reprogram DMC firmware after s3/s4.
      - GLK DC states - Fix idleness calculation.
      
      * tag 'drm-intel-fixes-2017-10-04' of git://anongit.freedesktop.org/git/drm-intel:
        drm/i915/glk: Fix DMC/DC state idleness calculation
        drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume
        drm/i915: Fix DDI PHY init if it was already on
      00bb09c4
  5. 05 Oct, 2017 6 commits
    • Linus Torvalds's avatar
      Merge tag 'pm-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7a92616c
      Linus Torvalds authored
      Pull power management fix from Rafael Wysocki:
       "This fixes a code ordering issue in the main suspend-to-idle loop that
        causes some "low power S0 idle" conditions to be incorrectly reported
        as unmet with suspend/resume debug messages enabled"
      
      * tag 'pm-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / s2idle: Invoke the ->wake() platform callback earlier
      7a92616c
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-sleep' · ca935f8e
      Rafael J. Wysocki authored
      * pm-sleep:
        PM / s2idle: Invoke the ->wake() platform callback earlier
      ca935f8e
    • Linus Torvalds's avatar
      Merge tag 'for-4.14/dm-fixes' of... · 076264ad
      Linus Torvalds authored
      Merge tag 'for-4.14/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
      
      Pull device mapper fixes from Mike Snitzer:
      
       - a stable fix for the alignment of the event number reported at the
         end of the 'DM_LIST_DEVICES' ioctl.
      
       - a couple stable fixes for the DM crypt target.
      
       - a DM raid health status reporting fix.
      
      * tag 'for-4.14/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm raid: fix incorrect status output at the end of a "recover" process
        dm crypt: reject sector_size feature if device length is not aligned to it
        dm crypt: fix memory leak in crypt_ctr_cipher_old()
        dm ioctl: fix alignment of event number in the device list
      076264ad
    • Jonathan Brassow's avatar
      dm raid: fix incorrect status output at the end of a "recover" process · 41dcf197
      Jonathan Brassow authored
      There are three important fields that indicate the overall health and
      status of an array: dev_health, sync_ratio, and sync_action.  They tell
      us the condition of the devices in the array, and the degree to which
      the array is synchronized.
      
      This commit fixes a condition that is reported incorrectly.  When a member
      of the array is being rebuilt or a new device is added, the "recover"
      process is used to synchronize it with the rest of the array.  When the
      process is complete, but the sync thread hasn't yet been reaped, it is
      possible for the state of MD to be:
       mddev->recovery = [ MD_RECOVERY_RUNNING MD_RECOVERY_RECOVER MD_RECOVERY_DONE ]
       curr_resync_completed = <max dev size> (but not MaxSector)
       and all rdevs to be In_sync.
      This causes the 'array_in_sync' output parameter that is passed to
      rs_get_progress() to be computed incorrectly and reported as 'false' --
      or not in-sync.  This in turn causes the dev_health status characters to
      be reported as all 'a', rather than the proper 'A'.
      
      This can cause erroneous output for several seconds at a time when tools
      will want to be checking the condition due to events that are raised at
      the end of a sync process.  Fix this by properly calculating the
      'array_in_sync' return parameter in rs_get_progress().
      
      Also, remove an unnecessary intermediate 'recovery_cp' variable in
      rs_get_progress().
      Signed-off-by: default avatarJonathan Brassow <jbrassow@redhat.com>
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      41dcf197
    • Arnd Bergmann's avatar
      KVM: add X86_LOCAL_APIC dependency · e42eef4b
      Arnd Bergmann authored
      The rework of the posted interrupt handling broke building without
      support for the local APIC:
      
      ERROR: "boot_cpu_physical_apicid" [arch/x86/kvm/kvm-intel.ko] undefined!
      
      That configuration is probably not particularly useful anyway, so
      we can avoid the randconfig failures by adding a Kconfig dependency.
      
      Fixes: 8b306e2f ("KVM: VMX: avoid double list add with VT-d posted interrupts")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
      e42eef4b
    • Linus Torvalds's avatar
      Merge tag 'sound-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 0f380715
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A collection of small fixes, mostly with stable ones:
      
       - X32 ABI fix for PCM; likely not so many people suffer from it, but
         still better to fix
      
       - Two minor kernel warning fixes on USB audio devices spotted by
         syzkaller
      
       - Regression fix of echoaudio due to its inconsistent dimension
      
       - Fix for HBR support on Intel DP audio, on some recent chips
      
       - USB-audio quirk for yet another Plantronics devices
      
       - Fix for potential double-fetch in ASIHPI FIFO queue"
      
      * tag 'sound-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usx2y: Suppress kernel warning at page allocation failures
        Revert "ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members"
        ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor
        ALSA: pcm: Fix structure definition for X32 ABI
        ALSA: usb-audio: Add sample rate quirk for Plantronics C310/C520-M
        ALSA: hda - program ICT bits to support HBR audio
        ALSA: asihpi: fix a potential double-fetch bug when copying puhm
        ALSA: compress: Remove unused variable
      0f380715