1. 27 Apr, 2018 9 commits
    • Linus Torvalds's avatar
      Merge tag 'tty-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · b52c85a7
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are some tty and serial driver fixes for reported issues for
        4.17-rc3.
      
        Nothing major, but a number of small things:
      
         - device tree fixes/updates for serial ports
      
         - earlycon fixes
      
         - n_gsm fixes
      
         - tty core change reverted to help resolve syszkaller reports
      
         - other serial driver small fixes
      
        All of these have been in linux-next with no reported issues"
      
      * tag 'tty-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: Use __GFP_NOFAIL for tty_ldisc_get()
        tty: serial: xuartps: Setup early console when uartclk is also passed
        tty: Don't call panic() at tty_ldisc_init()
        tty: Avoid possible error pointer dereference at tty_ldisc_restore().
        dt-bindings: mvebu-uart: DT fix s/interrupts-names/interrupt-names/
        tty: serial: qcom_geni_serial: Use signed variable to get IRQ
        earlycon: Use a pointer table to fix __earlycon_table stride
        serial: sh-sci: Document r8a77470 bindings
        dt-bindings: meson-uart: DT fix s/clocks-names/clock-names/
        serial: imx: fix cached UCR2 read on software reset
        serial: imx: warn user when using unsupported configuration
        serial: mvebu-uart: Fix local flags handling on termios update
        tty: n_gsm: Fix DLCI handling for ADM mode if debug & 2 is not set
        tty: n_gsm: Fix long delays with control frame timeouts in ADM mode
      b52c85a7
    • Linus Torvalds's avatar
      Merge tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 79a17dd9
      Linus Torvalds authored
      Pull staging fixes from Greg KH:
       "Here are two staging driver fixups for 4.17-rc3.
      
        The first is the remaining stragglers of the irda code removal that
        you pointed out during the merge window. The second is a fix for the
        wilc1000 driver due to a patch that got merged in 4.17-rc1.
      
        Both of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: wilc1000: fix NULL pointer exception in host_int_parse_assoc_resp_info()
        staging: irda: remove remaining remants of irda code removal
      79a17dd9
    • Linus Torvalds's avatar
      Merge tag 'usb-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 1993cbf0
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are a number of USB driver fixes for reported problems for
        4.17-rc3.
      
        The "largest" here is a number of phy core changes for reported
        problems with the -rc1 release. There's also the usual musb and xhci
        fixes, as well as new device id updates. There are also some usbip
        fixes for reported problems as more people start to use that code with
        containers.
      
        All of these have been in linux-next with no reported issues, except
        the last few new device ids, which are "obviously correct" :)"
      
      * tag 'usb-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (26 commits)
        USB: musb: dsps: drop duplicate phy initialisation
        USB: musb: host: prevent core phy initialisation
        usb: core: phy: add the SPDX-License-Identifier and include guard
        xhci: Fix Kernel oops in xhci dbgtty
        usb: select USB_COMMON for usb role switch config
        usb: core: phy: add missing forward declaration for "struct device"
        usb: core: phy: make it a no-op if CONFIG_GENERIC_PHY is disabled
        usb: core: use phy_exit during suspend if wake up is not supported
        usb: core: split usb_phy_roothub_{init,alloc}
        usb: core: phy: fix return value of usb_phy_roothub_exit()
        usb: typec: ucsi: Increase command completion timeout value
        Revert "xhci: plat: Register shutdown for xhci_plat"
        usb: core: Add quirk for HP v222w 16GB Mini
        Documentation: typec.rst: Use literal-block element with ascii art
        usb: typec: ucsi: fix tracepoint related build error
        usbip: usbip_event: fix to not print kernel pointer address
        usbip: usbip_host: fix to hold parent lock for device_attach() calls
        usbip: vhci_hcd: Fix usb device and sockfd leaks
        usbip: vhci_hcd: check rhport before using in vhci_hub_control()
        USB: Increment wakeup count on remote wakeup.
        ...
      1993cbf0
    • Linus Torvalds's avatar
      Merge tag 'sound-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 7ff50002
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A significant amount of fixes have been piled up at this time.
      
         - Possible Spectre v1 coverage in OSS sequencer API, control API,
           HD-audio hwdep ioctl, ASIHPI hwdep ioctl, OPL3, and HDSPM/RME
           channel_info API.
      
         - A regression fix in PCM delay reporting that happened at the code
           refactoring for the set_fs() removal
      
         - The long-standing bug in PCM sync_ptr ioctl that missed the audio
           timestamp field
      
         - USB-audio regression fixes due to the recent UAC2 jack support
      
         - vm_fault_t conversions in a couple of places
      
         - ASoC topology API fixes
      
         - Assorted driver fixes:
            * ASoC rsnd, FSL, Intel SST, DMIC, AMD, ADAU17x1, Realtek codec
            * FireWire typo fix
            * HD-audio quirks and USB-audio Dell fixup
            * USB-audio UAC3 corrections"
      
      * tag 'sound-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (35 commits)
        ALSA: dice: fix error path to destroy initialized stream data
        ALSA: hda - Skip jack and others for non-existing PCM streams
        ALSA: hda/realtek - change the location for one of two front mics
        ALSA: rme9652: Hardening for potential Spectre v1
        ALSA: hdspm: Hardening for potential Spectre v1
        ALSA: asihpi: Hardening for potential Spectre v1
        ALSA: opl3: Hardening for potential Spectre v1
        ALSA: hda: Hardening for potential Spectre v1
        ALSA: control: Hardening for potential Spectre v1
        ALSA: seq: oss: Hardening for potential Spectre v1
        ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device
        ALSA: hda/realtek - Update ALC255 depop optimize
        ALSA: hda/realtek - Add some fixes for ALC233
        ALSA: pcm: Change return type to vm_fault_t
        ALSA: usx2y: Change return type to vm_fault_t
        ALSA: usb-audio: ADC3: Fix channel mapping conversion for ADC3.
        ALSA: dice: fix OUI for TC group
        ALSA: usb-audio: Skip broken EU on Dell dock USB-audio
        ALSA: usb-audio: Fix missing endian conversion
        ALSA: usb-audio: Fix forgotten conversion of control query functions
        ...
      7ff50002
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ee7141c9
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "This round of fixes has two larger changes that came in last week:
      
         - a couple of patches all intended to finally turn on USB support on
           various Amlogic SoC based boards. The respective driver were not
           finalized until very late before the merge window and the DT
           portion is the last bit now.
      
         - a defconfig update for gemini that had repeatedly missed the cut
           but that is required to actually boot any real machines with the
           default build.
      
        The rest are the usual small changes:
      
         - a fix for a nasty build regression on the OMAP memory drivers
      
         - a fix for a boot problem on Intel/Altera SocFPGA
      
         - a MAINTAINER file update
      
         - a couple of fixes for issues found by automated testing (kernelci,
           coverity, sparse, ...)
      
         - a few incorrect DT entries are updated to match the hardware"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: defconfig: Update Gemini defconfig
        ARM: s3c24xx: jive: Fix some GPIO names
        HISI LPC: Add Kconfig MFD_CORE dependency
        ARM: dts: Fix NAS4220B pin config
        MAINTAINERS: Remove myself as maintainer
        arm64: dts: correct SATA addresses for Stingray
        ARM64: dts: meson-gxm-khadas-vim2: enable the USB controller
        ARM64: dts: meson-gxl-nexbox-a95x: enable the USB controller
        ARM64: dts: meson-gxl-s905x-libretech-cc: enable the USB controller
        ARM64: dts: meson-gx-p23x-q20x: enable the USB controller
        ARM64: dts: meson-gxl-s905x-p212: enable the USB controller
        ARM64: dts: meson-gxm: add GXM specific USB host configuration
        ARM64: dts: meson-gxl: add USB host support
        ARM: OMAP2+: Fix build when using split object directories
        soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure
        soc: bcm: raspberrypi-power: Fix use of __packed
        ARM: dts: Fix cm2 and prm sizes for omap4
        ARM: socfpga_defconfig: Remove QSPI Sector 4K size force
        firmware: arm_scmi: remove redundant null check on array
        arm64: dts: juno: drop unnecessary address-cells and size-cells properties
      ee7141c9
    • Linus Torvalds's avatar
      Merge tag 'mtd/fixes-for-4.17-rc3' of git://git.infradead.org/linux-mtd · 245131e2
      Linus Torvalds authored
      Pull mtd fixes from Boris Brezillon:
      
       - Fix nanddev_mtd_erase() function to match the changes done in
         e7bfb3fd ("mtd: Stop updating erase_info->state and calling
         mtd_erase_callback()")
      
       - Fix a memory leak in the Tango NAND controller driver
      
       - Fix read/write to a suspended erase block in the CFI driver
      
       - Fix the DT parsing logic in the Marvell NAND controller driver
      
      * tag 'mtd/fixes-for-4.17-rc3' of git://git.infradead.org/linux-mtd:
        mtd: rawnand: marvell: fix the chip-select DT parsing logic
        mtd: cfi: cmdset_0002: Do not allow read/write to suspend erase block.
        mtd: cfi: cmdset_0001: Workaround Micron Erase suspend bug.
        mtd: cfi: cmdset_0001: Do not allow read/write to suspend erase block.
        mtd: spi-nor: cadence-quadspi: Fix page fault kernel panic
        mtd: nand: Fix nanddev_mtd_erase()
        mtd: rawnand: tango: Fix struct clk memory leak
      245131e2
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.17-rc3' of git://people.freedesktop.org/~airlied/linux · 0f940fac
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Pretty run of the mill for this stage in the cycle: msm, i915, amdgpu,
        qxl, virtio-gpu, sun4i fixes.
      
        i915:
         - Black screen fixes
         - Display w/a fix
         - HDA codec interop fix
      
        sun4i:
         - tbsa711 tablet regression fix
      
        qxl:
         - Regression fixes due to changes in TTM
      
        virtio:
         - Fix wait event condition
      
        msm:
         - DSI display fixes
      
        amdgpu:
         - fix hang on Carrizo
         - DP MST hang fixes
         - irq handling deadlock in DC.
      
        amdkfd:
         - Fix Kconfig issue
         - Clock retrieval fix
         - Sparse fixes"
      
      * tag 'drm-fixes-for-v4.17-rc3' of git://people.freedesktop.org/~airlied/linux: (27 commits)
        drm/edid: Reset more of the display info
        drm/virtio: fix vq wait_event condition
        qxl: keep separate release_bo pointer
        qxl: fix qxl_release_{map,unmap}
        Revert "drm/sun4i: add lvds mode_valid function"
        drm/amd/display: Check dc_sink every time in MST hotplug
        drm/amd/display: Update MST edid property every time
        drm/amd/display: Don't read EDID in atomic_check
        drm/amd/display: Disallow enabling CRTC without primary plane with FB
        drm/amd/display: Fix deadlock when flushing irq
        drm/i915/fbdev: Enable late fbdev initial configuration
        drm/i915: Use ktime on wait_for
        drm/amdgpu: set COMPUTE_PGM_RSRC1 for SGPR/VGPR clearing shaders
        drm/amdkfd: fix build, select MMU_NOTIFIER
        drm/amdkfd: fix clock counter retrieval for node without GPU
        drm/amdkfd: Fix the error return code in kfd_ioctl_unmap_memory_from_gpu()
        drm/amdkfd: kfd_dev_is_large_bar() can be static
        drm/i915: Enable display WA#1183 from its correct spot
        drm/i915/audio: set minimum CD clock to twice the BCLK
        drm/msm: don't deref error pointer in the msm_fbdev_create error path
        ...
      0f940fac
    • Arnd Bergmann's avatar
      Merge tag 'arm-soc/for-4.17/devicetree-arm64-fixes' of... · 4ea3f056
      Arnd Bergmann authored
      Merge tag 'arm-soc/for-4.17/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux into fixes
      
      Pull "Broadcom devicetree-arm64 fixes for 4.17" from Florian Fainelli:
      
      This pull request contains Broadcom ARM64-based SoCs Device Tree fixes
      for 4.17, please pull the following:
      
      - Srinath fixes the register base address of all SATA controllers on
        Stingray
      
      * tag 'arm-soc/for-4.17/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux:
        arm64: dts: correct SATA addresses for Stingray
      4ea3f056
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2018-04-26' of... · 24d9092c
      Dave Airlie authored
      Merge tag 'drm-intel-fixes-2018-04-26' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
      
      - Fix for black screen issues (FDO #104158 and #104425)
      - A correction for wrongly applied display W/A
      - Fixes for HDA codec interop issue (no audio) and too eager HW timeouts
      
      * tag 'drm-intel-fixes-2018-04-26' of git://anongit.freedesktop.org/drm/drm-intel:
        drm/i915/fbdev: Enable late fbdev initial configuration
        drm/i915: Use ktime on wait_for
        drm/i915: Enable display WA#1183 from its correct spot
        drm/i915/audio: set minimum CD clock to twice the BCLK
      24d9092c
  2. 26 Apr, 2018 31 commits
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 0644f186
      Linus Torvalds authored
      Pull virtio fixups from Michael Tsirkin:
      
       - Latest header update will break QEMU (if it's rebuilt with the new
         header) - and it seems that the code there is so fragile that any
         change in this header will break it. Add a better interface so users
         do not need to change their code every time that header changes.
      
       - Fix virtio console for spec compliance.
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        virtio_console: reset on out of memory
        virtio_console: move removal code
        virtio_console: drop custom control queue cleanup
        virtio_console: free buffers after reset
        virtio: add ability to iterate over vqs
        virtio_console: don't tie bufs to a vq
        virtio_balloon: add array of stat names
      0644f186
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.17-rc3' of... · 0871062b
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
      
       - Add support for new Ryzen chips to k10temp driver
         ... making Phoronix happy
      
       - Fix inconsistent chip access in nct6683 driver
      
       - Handle absence of few types of sensors in scmi driver
      
      * tag 'hwmon-for-linus-v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (k10temp) Add support for AMD Ryzen w/ Vega graphics
        hwmon: (k10temp) Add temperature offset for Ryzen 2700X
        hwmon: (nct6683) Enable EC access if disabled at boot
        hwmon: (scmi) handle absence of few types of sensors
      0871062b
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 7f5d1573
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
      
       - fix Aardvark MRRS setting (Evan Wang)
      
       - clarify "bandwidth available" link status message (Jakub Kicinski)
      
       - update Kirin GPIO name to fix probe failure (Loic Poulain)
      
       - fix Aardvark IRQ usage (Victor Gu)
      
       - fix Aardvark config accessor issues (Victor Gu)
      
      * tag 'pci-v4.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Add "PCIe" to pcie_print_link_status() messages
        PCI: kirin: Fix reset gpio name
        PCI: aardvark: Fix PCIe Max Read Request Size setting
        PCI: aardvark: Use ISR1 instead of ISR0 interrupt in legacy irq mode
        PCI: aardvark: Set PIO_ADDR_LS correctly in advk_pcie_rd_conf()
        PCI: aardvark: Fix logic in advk_pcie_{rd,wr}_conf()
      7f5d1573
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 47b5ece9
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
      
       - Add workqueue forward declaration (for new work, but a nice clean up)
      
       - seftest fixes for the new histogram code
      
       - Print output fix for hwlat tracer
      
       - Fix missing system call events - due to change in x86 syscall naming
      
       - Fix kprobe address being used by perf being hashed
      
      * tag 'trace-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix missing tab for hwlat_detector print format
        selftests: ftrace: Add a testcase for multiple actions on trigger
        selftests: ftrace: Fix trigger extended error testcase
        kprobes: Fix random address output of blacklist file
        tracing: Fix kernel crash while using empty filter with perf
        tracing/x86: Update syscall trace events to handle new prefixed syscall func names
        tracing: Add missing forward declaration
      47b5ece9
    • Linus Torvalds's avatar
      Merge tag 'acpi-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · fe03a759
      Linus Torvalds authored
      Pull ACPI fixes from Rafael Wysocki:
       "These are two watchdog-related fixes, fix for a backlight regression
        from the 4.16 cycle that unfortunately was propagated to -stable and a
        button module modification to prevent graphics driver modules from
        failing to load due to unmet dependencies if ACPI is disabled from the
        kernel command line.
      
        Specifics:
      
         - Change the ACPI subsystem initialization ordering to initialize the
           WDAT watchodg before reserving PNP motherboard resources so as to
           allow the watchdog to allocate its resources before the PNP code
           gets to them and prevents it from working correctly (Mika
           Westerberg).
      
         - Add a quirk for Lenovo Z50-70 to use the iTCO watchdog instead of
           the WDAT one which conflicts with the RTC on that platform (Mika
           Westerberg).
      
         - Avoid breaking backlight handling on Dell XPS 13 2013 model by
           allowing laptops to use the ACPI backlight by default even if they
           are Windows 8-ready in principle (Hans de Goede)"
      
      * tag 'acpi-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
        ACPI / button: make module loadable when booted in non-ACPI mode
        ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
        ACPI / scan: Initialize watchdog before PNP
      fe03a759
    • Linus Torvalds's avatar
      Merge tag 'pm-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · e58d911f
      Linus Torvalds authored
      Pull power management fixes from Rafael Wysocki:
       "These are a Low Power S0 Idle quirk, a hibernation handling fix for
        the PCI bus type and a brcmstb-avs-cpufreq driver fixup removing
        development debug code from it.
      
        Specifics:
      
         - Blacklist the Low Power S0 Idle _DSM on ThinkPad X1 Tablet(2016)
           where it causes issues and make it use ACPI S3 which works instead
           of the non-working suspend-to-idle by default (Chen Yu).
      
         - Fix the handling of hibernation in the PCI core for devices with
           the DPM_FLAG_SMART_SUSPEND flag set to fix a regression affecting
           intel-lpss I2C devices (Mika Westerberg).
      
         - Drop development debug code from the brcmstb-avs-cpufreq driver
           (Markus Mayer)"
      
      * tag 'pm-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: brcmstb-avs-cpufreq: remove development debug support
        PCI / PM: Do not clear state_saved in pci_pm_freeze() when smart suspend is set
        ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016)
      e58d911f
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 665fa000
      Linus Torvalds authored
      Pull /dev/random fixes from Ted Ts'o:
       "Fix a regression on NUMA kernels and suppress excess unseeded entropy
        pool warnings"
      
      * tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: rate limit unseeded randomness warnings
        random: fix possible sleeping allocation from irq context
      665fa000
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 1334ac11
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
       "A couple of bug fixes:
      
         - correct some CPU-MF counter names for z13 and z14
      
         - correct locking in the vfio-ccw fsm_io_helper function
      
         - provide arch_uretprobe_is_alive to avoid sigsegv with uretprobes
      
         - fix a corner case with CPU-MF sampling in regard to execve
      
         - fix expoline code revert for loadable modules
      
         - update chpid descriptor for resource accessibility events
      
         - fix dasd I/O errors due to outdated device alias infomation"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: correct module section names for expoline code revert
        vfio: ccw: process ssch with interrupts disabled
        s390: update sampling tag after task pid change
        s390/cpum_cf: rename IBM z13/z14 counter names
        s390/dasd: fix IO error for newly defined devices
        s390/uprobes: implement arch_uretprobe_is_alive()
        s390/cio: update chpid descriptor after resource accessibility event
      1334ac11
    • Greg Kroah-Hartman's avatar
      Merge tag 'usb-serial-4.17-rc3' of... · 573a0948
      Greg Kroah-Hartman authored
      Merge tag 'usb-serial-4.17-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
      
      Johan writes:
      
      USB-serial fixes for v4.17-rc3
      
      Here are a few device ids for -rc3, including a new "simple driver".
      
      All have been in linux-next with no reported issues.
      Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
      573a0948
    • Miquel Raynal's avatar
      mtd: rawnand: marvell: fix the chip-select DT parsing logic · f6997bec
      Miquel Raynal authored
      The block responsible of parsing the DT for the number of chip-select
      lines uses an 'if/else if/else if' block. The content of the second and
      third 'else if' conditions are:
              1/ the actual condition to enter the sub-block and
              2/ the operation to do in this sub-block.
      
              [...]
              else if (condition1_to_enter && action1() == failed)
                      raise_error();
              else if (condition2_to_enter && action2() == failed)
                      raise_error();
              [...]
      
      In case of failure, the sub-block is entered and an error raised.
      Otherwise, in case of success, the code would continue erroneously in
      the next 'else if' statement because it did not failed (and did not
      enter the first 'else if' sub-block).
      
      The first 'else if' refers to legacy bindings while the second 'else if'
      refers to new bindings. The second 'else if', which is entered
      erroneously, checks for the 'reg' property, which, for old bindings,
      does not mean anything because it would not be the number of CS
      available, but the regular register map of almost any DT node. This
      being said, the content of the 'reg' property being the register map
      offset and length, it has '2' values, so the number of CS in this
      situation is assumed to be '2'.
      
      When running nand_scan_ident() with 2 CS, the core will check for an
      array of chips. It will first issue a RESET and then a READ_ID. Of
      course this will trigger two timeouts because there is no chip in front
      of the second CS:
      
      [    1.367460] marvell-nfc f2720000.nand: Timeout on CMDD (NDSR: 0x00000080)
      [    1.474292] marvell-nfc f2720000.nand: Timeout on CMDD (NDSR: 0x00000280)
      
      Indeed, this is harmless and the core will then assume there is only one
      valid CS.
      
      Fix the logic in the whole block by entering each sub-block just on the
      'is legacy' condition, doing the action inside the sub-block. This way,
      when the action succeeds, the whole block is left.
      
      Furthermore, for both the old bindings and the new bindings the same
      logic was applied to retrieve the number of CS lines:
      using of_get_property() to get a size in bytes, converted in the actual
      number of lines by dividing it per sizeof(u32) (4 bytes).
      
      This is fine for the 'reg' property which is a list of the CS IDs but
      not for the 'num-cs' property which is directly the value of the number
      of CS.
      
      Anyway, no existing DT uses another value than 'num-cs = <1>' and no
      other value has ever been supported by the old driver (pxa3xx_nand.c).
      Remove this condition and apply a number of 1 CS anyway, as already
      described in the bindings.
      
      Finally, the 'reg' property of a 'nand' node (with the new bindings)
      gives the IDs of each CS line in use. marvell_nand.c driver first look
      at the number of CS lines that are present in this property.
      
      Better use of_property_count_elems_of_size() than dividing by 4 the size
      of the number of bytes returned by of_get_property().
      
      Fixes: 02f26ecf ("mtd: nand: add reworked Marvell NAND controller driver")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
      Tested-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
      Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
      f6997bec
    • Linus Walleij's avatar
      ARM: defconfig: Update Gemini defconfig · c12d7e9f
      Linus Walleij authored
      This updates the Gemini defconfig with a config that will bring
      up most of the recently merged and updated devices to some
      functional level:
      
      - We enable high resolution timers (the right thing to do)
      - Enable CMA for the framebuffer, and the new TVE200
        framebuffer driver and the Ilitek ILI9322 driver for
        graphics on the D-Link DIR-685. HIGHMEM support comes in
        as part of this.
      - Enable networking and the new Cortina Gemini ethernet
        driver.
      - Enable MDIO over GPIO and the Realtek PHY devices used on
        several of these systems.
      - Enable I2C over GPIO and SPI over GPIO which is used on
        several of these devices.
      - Enable the Thermal framework, GPIO fan control and LM75 sensor
        adding cooling on the D-Link DNS-313 with no userspace
        involved even if only the kernel is working, rock solid
        thermal for this platform.
      - Enable JEDEC flash probing to support the Eon flash chip in
        D-Link DNS-313.
      - Enable LED disk triggers for the NAS type devices.
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      c12d7e9f
    • Linus Walleij's avatar
      ARM: s3c24xx: jive: Fix some GPIO names · ef740508
      Linus Walleij authored
      One of the bitbanged SPI hosts had wrongly named GPIO lines due to
      sloppiness by yours truly.
      
      Cc: arm@kernel.org
      Cc: Mark Brown <broonie@kernel.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      ef740508
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v4.17/fixes-signed' of... · 21f2db5c
      Arnd Bergmann authored
      Merge tag 'omap-for-v4.17/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Pull "Two fixes for v4.17-rc cycle" from Tony Lindgren:
      
      Fix a build regression with split object directories reported by Russell
      and fix range sizes for omap4 cm2 and prm modules.
      
      * tag 'omap-for-v4.17/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Fix build when using split object directories
        ARM: dts: Fix cm2 and prm sizes for omap4
      21f2db5c
    • John Garry's avatar
      HISI LPC: Add Kconfig MFD_CORE dependency · 4b313ca7
      John Garry authored
      For ACPI support of the HiSilicon LPC driver we depend
      on MFD_CORE config.
      
      Currently the HiSi LPC Kconfig entry does not define this
      dependency, so add it.
      
      The reason for depending on MFD_CORE in the driver is
      that we model the LPC host as an MFD, in that a platform
      device will be created for each device on the bus.
      
      We do this as we need to modify the resources of these
      derived platform devices, something which we should not
      do to the original devices created in the ACPI scan.
      Details in e0aa1563 ("HISI LPC: Add ACPI support").
      
      Fixes: e0aa1563 ("HISI LPC: Add ACPI support")
      Reported-and-tested-by: default avatarTan Xiaojun <tanxiaojun@huawei.com>
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      4b313ca7
    • Arnd Bergmann's avatar
      Merge tag 'amlogic-fixes' of... · 7b069b11
      Arnd Bergmann authored
      Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes
      
      Pull "Amlogic fixes for v4.17-rc1" from Kevin Hilman:
      - add / enable USB host support for GX boards
      
      * tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        ARM64: dts: meson-gxm-khadas-vim2: enable the USB controller
        ARM64: dts: meson-gxl-nexbox-a95x: enable the USB controller
        ARM64: dts: meson-gxl-s905x-libretech-cc: enable the USB controller
        ARM64: dts: meson-gx-p23x-q20x: enable the USB controller
        ARM64: dts: meson-gxl-s905x-p212: enable the USB controller
        ARM64: dts: meson-gxm: add GXM specific USB host configuration
        ARM64: dts: meson-gxl: add USB host support
      7b069b11
    • Linus Walleij's avatar
      ARM: dts: Fix NAS4220B pin config · 1c3bc8fb
      Linus Walleij authored
      The DTS file for the NAS4220B had the pin config for the
      ethernet interface set to the pins in the SL3512 SoC while
      this system is using SL3516. Fix it by referencing the
      right SL3516 pins instead of the SL3512 pins.
      
      Cc: stable@vger.kernel.org
      Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
      Reported-by: default avatarAndreas Fiedler <andreas.fiedler@gmx.net>
      Reported-by: default avatarRoman Yeryomin <roman@advem.lv>
      Tested-by: default avatarRoman Yeryomin <roman@advem.lv>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      1c3bc8fb
    • Niklas Cassel's avatar
      MAINTAINERS: Remove myself as maintainer · e13db2d3
      Niklas Cassel authored
      I am leaving Axis, so this address will bounce in the not too
      distant future.
      
      Fortunately, I will still be working with the community.
      Signed-off-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      e13db2d3
    • Arnd Bergmann's avatar
      Merge tag 'scmi-fixes-4.17' of... · cc753358
      Arnd Bergmann authored
      Merge tag 'scmi-fixes-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes
      
      SCMI fix for v4.17
      
      A single patch eliminating the redundant null pointer check detected
      by CoverityScan("Array compared against 0")
      
      * tag 'scmi-fixes-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
        firmware: arm_scmi: remove redundant null check on array
      cc753358
    • Arnd Bergmann's avatar
      Merge tag 'juno-fixes-4.17' of... · ee370b42
      Arnd Bergmann authored
      Merge tag 'juno-fixes-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes
      
      Pull "ARMv8 Juno DT fix for v4.17" from Sudeep Holla:
      
      A single patch to fix the new DTC warnings probably enabled during
      v4.17 merge window.
      
      * tag 'juno-fixes-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
        arm64: dts: juno: drop unnecessary address-cells and size-cells properties
      ee370b42
    • Arnd Bergmann's avatar
      Merge tag 'arm-soc/for-4.17/drivers-fixes' of https://github.com/Broadcom/stblinux into fixes · c7d0a032
      Arnd Bergmann authored
      This pull request contains Broadcom SoCs drivers fixes, please pull the
      following:
      
      - Geert makes the Raspberry Pi firmwware return -ENOSYS (similar to
        other subsystems) when CONFIG_RASPBERRYPI_FIRMWARE is off.
      
      - Florian fixes an incorrect annotation in the Raspberry Pi power domain
        driver, spotted by sparse
      
      * tag 'arm-soc/for-4.17/drivers-fixes' of https://github.com/Broadcom/stblinux:
        soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure
        soc: bcm: raspberrypi-power: Fix use of __packed
      c7d0a032
    • Arnd Bergmann's avatar
      Merge tag 'socfpga_defconfig_fix_v4.17' of... · a0a2d050
      Arnd Bergmann authored
      Merge tag 'socfpga_defconfig_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into fixes
      
      ARM: socfpga_defconfig: fix QSPI Sector 4k
      - disable CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
      
      * tag 'socfpga_defconfig_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
        ARM: socfpga_defconfig: Remove QSPI Sector 4K size force
      a0a2d050
    • Takashi Sakamoto's avatar
      ALSA: dice: fix error path to destroy initialized stream data · 0f925660
      Takashi Sakamoto authored
      In error path of snd_dice_stream_init_duplex(), stream data for incoming
      packet can be left to be initialized.
      
      This commit fixes it.
      
      Fixes: 436b5abe ('ALSA: dice: handle whole available isochronous streams')
      Cc: <stable@vger.kernel.org> # v4.6+
      Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      0f925660
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-watchdog', 'acpi-button' and 'acpi-video' · bd6dff55
      Rafael J. Wysocki authored
      * acpi-watchdog:
        ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
      
      * acpi-button:
        ACPI / button: make module loadable when booted in non-ACPI mode
      
      * acpi-video:
        ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
      bd6dff55
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-pm' and 'pm-cpufreq' · e140c4af
      Rafael J. Wysocki authored
      * acpi-pm:
        ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016)
      
      * pm-cpufreq:
        cpufreq: brcmstb-avs-cpufreq: remove development debug support
      e140c4af
    • Linus Torvalds's avatar
      Merge tag 'for_v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 69bfd470
      Linus Torvalds authored
      Pull fsnotify fix from Jan Kara:
       "A fix of a fsnotify race causing panics / softlockups"
      
      * tag 'for_v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fsnotify: Fix fsnotify_mark_connector race
      69bfd470
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 3442097b
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "Eight bug fixes, one spelling update and one tracepoint addition.
      
        The most serious is probably the mptsas write same fix because it
        means anyone using these controllers sees errors when modern
        filesystems try to issue discards"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: target: fix crash with iscsi target and dvd
        scsi: sd_zbc: Avoid that resetting a zone fails sporadically
        scsi: sd: Defer spinning up drive while SANITIZE is in progress
        scsi: megaraid_sas: Do not log an error if FW successfully initializes.
        scsi: ufs: add trace event for ufs upiu
        scsi: core: remove reference to scsi_show_extd_sense()
        scsi: mptsas: Disable WRITE SAME
        scsi: fnic: fix spelling mistake in fnic stats "Abord" -> "Abort"
        scsi: scsi_debug: IMMED related delay adjustments
        scsi: iscsi: respond to netlink with unicast when appropriate
      3442097b
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20180425' of git://git.kernel.dk/linux-block · 8fba70b0
      Linus Torvalds authored
      Pull block updates from Jens Axboe:
       "I ended up sitting on this about a week longer than I wanted to, since
        we were hashing out details with a timeout change. I've now killed
        that patch, so we can flush the existing queue in due time.
      
        This contains:
      
         - Fix for an old regression, where entering the queue can be
           disturbed by a signal to the process. This can cause spurious EIO.
           Fix from Alan Jenkins.
      
         - cdrom information leak fix from Dan.
      
         - Trivial helper for testing queue FUA from Dave Chinner, part of his
           O_DIRECT FUA series.
      
         - Series of swim fixes from Finn that actually makes it work again.
      
         - Loop O_DIRECT corruption fix, which caused data corruption in
           production for us. From me.
      
         - BFQ crash fix from me.
      
         - bcache maintainer update. Michael no longer has the time to do it,
           Coly has stepped up to serve as the new maintainer.
      
         - blkcg locking fixes from Jiang Biao.
      
         - Revert of a change from this merge window from Ming, that causes an
           issue on some hardware.
      
         - Minor clarification doc addition from Linus Walleij"
      
      * tag 'for-linus-20180425' of git://git.kernel.dk/linux-block: (22 commits)
        Revert "blk-mq: remove code for dealing with remapping queue"
        block: mq: Add some minor doc for core structs
        bcache: mark Coly Li as bcache maintainer
        MAINTAINERS: Remove me as maintainer of bcache
        blkcg: init root blkcg_gq under lock
        blkcg: small fix on comment in blkcg_init_queue
        blkcg: don't hold blkcg lock when deactivating policy
        block: add blk_queue_fua() helper function
        cdrom: information leak in cdrom_ioctl_media_changed()
        bfq-iosched: ensure to clear bic/bfqq pointers when preparing request
        blk-mq: start request gstate with gen 1
        block/swim: Select appropriate drive on device open
        block/swim: Fix IO error at end of medium
        block/swim: Check drive type
        block/swim: Rename macros to avoid inconsistent inverted logic
        block/swim: Don't log an error message for an invalid ioctl
        block/swim: Remove extra put_disk() call from error path
        block/swim: Fix array bounds check
        m68k/mac: Don't remap SWIM MMIO region
        loop: handle short DIO reads
        ...
      8fba70b0
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-4.17-rc3' of... · c6dc3e71
      Linus Torvalds authored
      Merge tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
      
      Pull RISC-V fixes from Palmer Dabbelt:
       "This contains three small fixes related to the RISC-V port that I'd
        like to target for 4.17-rc3:
      
         - a Kconfig cleanup to select DMA_DIRECT_OPS instead of redefining it
           in arch/riscv
      
         - the removal of asm/handle_irq.h, which doesn't exist, from our arch
           header list
      
         - the addition of "-no-pie" the link rules for our VDSO-related
           files, which fixes the build on systems where PIE is enabled by
           default"
      
      * tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
        RISC-V: build vdso-dummy.o with -no-pie
        riscv: there is no <asm/handle_irq.h>
        riscv: select DMA_DIRECT_OPS instead of redefining it
      c6dc3e71
    • Dave Airlie's avatar
      Merge tag 'drm-misc-fixes-2018-04-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes · bb1278e8
      Dave Airlie authored
      sun41: Fix regression for TBSA711 tablet (Ondrej)
      qxl: 2 bug fixes (Gerd)
      core: Don't use stale display info between HDMI hotplugs (Ville)
      virtio: Fix guest spinning when request queue is full (Gerd)
      
      Cc: Ondrej Jirman <megous@megous.com>
      Cc: Gerd Hoffmann <kraxel@redhat.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      
      * tag 'drm-misc-fixes-2018-04-25' of git://anongit.freedesktop.org/drm/drm-misc:
        drm/edid: Reset more of the display info
        drm/virtio: fix vq wait_event condition
        qxl: keep separate release_bo pointer
        qxl: fix qxl_release_{map,unmap}
        Revert "drm/sun4i: add lvds mode_valid function"
      bb1278e8
    • Dave Airlie's avatar
      Merge tag 'drm-msm-fixes-2018-04-25' of git://people.freedesktop.org/~robclark/linux into drm-fixes · 14cdea89
      Dave Airlie authored
      A few fixes for 4.17.. thanks to Sean for helping pull together some
      of the display related fixes while I was off in compute-land.
      
      * tag 'drm-msm-fixes-2018-04-25' of git://people.freedesktop.org/~robclark/linux:
        drm/msm: don't deref error pointer in the msm_fbdev_create error path
        drm/msm/dsi: use correct enum in dsi_get_cmd_fmt
        drm/msm: Fix possible null dereference on failure of get_pages()
        drm/msm: Add modifier to mdp_get_format arguments
        drm/msm: Mark the crtc->state->event consumed
        drm/msm/dsi: implement auto PHY timing calculator for 10nm PHY
        drm/msm/dsi: check video mode engine status before waiting
        drm/msm/dsi: check return value for video done waits
      14cdea89
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-4.17' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 8eb8ad52
      Dave Airlie authored
      - Fix a hang on CZ boards with EDC enabled
      - Fix hangs related to DP MST handling
      - Fix a deadlock in irq handling in DC
      
      * 'drm-fixes-4.17' of git://people.freedesktop.org/~agd5f/linux:
        drm/amd/display: Check dc_sink every time in MST hotplug
        drm/amd/display: Update MST edid property every time
        drm/amd/display: Don't read EDID in atomic_check
        drm/amd/display: Disallow enabling CRTC without primary plane with FB
        drm/amd/display: Fix deadlock when flushing irq
        drm/amdgpu: set COMPUTE_PGM_RSRC1 for SGPR/VGPR clearing shaders
      8eb8ad52