1. 08 Jun, 2015 7 commits
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 056537c6
      Linus Torvalds authored
      Pull last-minute virtio fix from Michael Tsirkin:
       "This fixes a minor issue affecting multiqueue virtio net when user
        keeps changing the number of active queues and CPUs are added and
        removed by hotplug"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        virtio_pci: Clear stale cpumask when setting irq affinity
      056537c6
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 40b985fb
      Linus Torvalds authored
      Pull ARM SoC fixes from Kevin Hilman:
       "About 10 days worth of small bug fixes, and the (hopefully) final
        round fixes for from arm-soc land for the -rc cycle.  Nothing special
        to note, but here's a brief summary of fixes by SoC type:
      
         - OMAP:
              small set of misc DT fixes; boot fix for THUMB2 kernel
      
         - mediatek:
              PMIC fixes; DT fix for model name
      
         - exynos:
              wakeup interupt fixes for 3250
      
         - mvebu:
              revert mbus patch which broke DMA masters
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage
        ARM: dts: AM35xx: fix system control module clocks
        arm64: dts: mt8173-evb: fix model name
        ARM: exynos: Fix wake-up interrupts for Exynos3250
        ARM: dts: Fix n900 dts file to work around 4.1 touchscreen regression on n900
        ARM: dts: Fix dm816x to use right compatible flag for MUSB
        ARM: OMAP3: Fix booting with thumb2 kernel
        Revert "bus: mvebu-mbus: make sure SDRAM CS for DMA don't overlap the MBus bridge window"
        bus: mvebu-mbus: do not set WIN_CTRL_SYNCBARRIER on non io-coherent platforms.
        ARM: mvebu: armada-xp-linksys-mamba: Disable internal RTC
        soc: mediatek: Add compile dependency to pmic-wrapper
        soc: mediatek: PMIC wrap: Fix register state machine handling
        soc: mediatek: PMIC wrap: Fix clock rate handling
      40b985fb
    • Kevin Hilman's avatar
      Merge tag 'omap-for-v4.1/fixes-rc6' of... · 0a68c6bc
      Kevin Hilman authored
      Merge tag 'omap-for-v4.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Merge omap fixes for v4.1, urgent fix to avoid potential hardware damage From Tony Lindgren:
      
      Omap fixes for the -rc cycle, including a fix for potential hardware
      breakage on BeagleBones:
      
      - BeagleBones don't support RTC-only mode, it can cause hardware
        damage if system-power-controller is specified without
        ti,pmic-shutdown-controller
      
      - Fix a recent regression to am3517 SoCs caused by the recent clock
        move that was not noticed until now despite automated boot
        testing
      
      - Fix a regression for n900 touchscreen triggered by recent
        recent input changes
      
      - Fix compatible property for dm816x USB to avoid errors with
        USB Ethernet
      
      - Fix oops for omap3 when built with CONFIG_THUMB2_KERNEL
      
      * tag 'omap-for-v4.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage
        ARM: dts: AM35xx: fix system control module clocks
        ARM: dts: Fix n900 dts file to work around 4.1 touchscreen regression on n900
        ARM: dts: Fix dm816x to use right compatible flag for MUSB
        ARM: OMAP3: Fix booting with thumb2 kernel
      0a68c6bc
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/intel-iommu · 181e5059
      Linus Torvalds authored
      Pull Intel IOMMU fix from David Woodhouse:
       "This fixes an oops when attempting to enable 1:1 passthrough mode for
        devices on which VT-d translation was disabled anyway.
      
        It's actually a long-standing bug but recent changes (commit
        18436afd: "iommu/vt-d: Allow RMRR on graphics devices too") have
        made it much easier to trigger with 'iommu=pt intel_iommu=igfx_off' on
        the command line"
      
      * git://git.infradead.org/intel-iommu:
        iommu/vt-d: Fix passthrough mode with translation-disabled devices
      181e5059
    • Linus Torvalds's avatar
      Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 86579aa4
      Linus Torvalds authored
      Pull libata fixes from Tejun Heo:
       "Two driver fixes.  One is for an ahci_mvebu controller config bug and
        the other fixes pata_octeon_cf build issue"
      
      * 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        pata_octeon_cf: fix broken build
        ata: ahci_mvebu: Fix wrongly set base address for the MBus window setting
      86579aa4
    • Aaro Koskinen's avatar
      pata_octeon_cf: fix broken build · 4710f2fa
      Aaro Koskinen authored
      MODULE_DEVICE_TABLE is referring to wrong driver's table and breaks the
      build. Fix that.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@nokia.com>
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      4710f2fa
    • Linus Torvalds's avatar
      Linux 4.1-rc7 · d4a4f75c
      Linus Torvalds authored
      d4a4f75c
  2. 07 Jun, 2015 6 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 866e6441
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "Eight fixes across arch/mips.  Nothing stands particuarly out nor is
        complicated but fixes keep coming in at a higher than comfortable
        rate"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: KVM: Do not sign extend on unsigned MMIO load
        MIPS: BPF: Fix stack pointer allocation
        MIPS: Loongson-3: Fix a cpu-hotplug issue in loongson3_ipi_interrupt()
        MIPS: Fix enabling of DEBUG_STACKOVERFLOW
        MIPS: c-r4k: Fix typo in probe_scache()
        MIPS: Avoid an FPE exception in FCSR mask probing
        MIPS: ath79: Add a missing new line in log message
        MIPS: ralink: Fix clearing the illegal access interrupt
      866e6441
    • Linus Torvalds's avatar
      Merge tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 37ef1647
      Linus Torvalds authored
      Pull driver core fixes from Greg KH:
       "Here are two fixes for the driver core that resolve some reported
        issues.
      
        One is a regression from 4.0, the other a fixes a reported oops that
        has been there since 3.19.
      
        Both have been in linux-next for a while with no problems"
      
      * tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        drivers/base: cacheinfo: handle absence of caches
        drivers: of/base: move of_init to driver_init
      37ef1647
    • Linus Torvalds's avatar
      Merge tag 'staging-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · eadc21f5
      Linus Torvalds authored
      Pull staging / IIO fixes from Greg KH:
       "Here are some IIO driver fixes to resolve reported issues, some ozwpan
        fixes for some reported CVE problems, and a rtl8712 driver fix for a
        reported regression.
      
        All have been in linux-next successfully"
      
      * tag 'staging-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: rtl8712: fix stack dump
        ozwpan: unchecked signed subtraction leads to DoS
        ozwpan: divide-by-zero leading to panic
        ozwpan: Use unsigned ints to prevent heap overflow
        ozwpan: Use proper check to prevent heap overflow
        iio: adc: twl6030-gpadc: Fix modalias
        iio: adis16400: Fix burst transfer for adis16448
        iio: adis16400: Fix burst mode
        iio: adis16400: Compute the scan mask from channel indices
        iio: adis16400: Use != channel indices for the two voltage channels
        iio: adis16400: Report pressure channel scale
      eadc21f5
    • Linus Torvalds's avatar
      Merge tag 'tty-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · b334b773
      Linus Torvalds authored
      Pull tty/serial driver fixes from Greg KH:
       "Here are a few TTY and Serial driver fixes for reported regressions
        and crashes.
      
        All of these have been in linux-next with no reported problems"
      
      * tag 'tty-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        n_tty: Fix auditing support for cannonical mode
        serial: 8250_omap: provide complete custom startup & shutdown callbacks
        n_tty: Fix calculation of size in canon_copy_from_read_buf
        serial: imx: Fix DMA handling for IDLE condition aborts
        serial/amba-pl011: Unconditionally poll for FIFO space before each TX char
      b334b773
    • Linus Torvalds's avatar
      Merge tag 'usb-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · e900f2c0
      Linus Torvalds authored
      Pull USB and PHY driver fixes from Greg KH:
       "Here are some USB and PHY driver fixes that resolve some reported
        regressions.  Also in here are some new device ids.
      
        All of the details are in the shortlog and these patches have been in
        linux-next with no problems"
      
      * tag 'usb-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
        USB: cp210x: add ID for HubZ dual ZigBee and Z-Wave dongle
        usb: renesas_usbhs: Don't disable the pipe if Control write status stage
        usb: renesas_usbhs: Fix fifo unclear in usbhsf_prepare_pop
        usb: gadget: f_fs: fix check in read operation
        usb: musb: fix order of conditions for assigning end point operations
        usb: gadget: f_uac1: check return code from config_ep_by_speed
        usb: gadget: ffs: fix: Always call ffs_closed() in ffs_data_clear()
        usb: gadget: g_ffs: Fix counting of missing_functions
        usb: s3c2410_udc: correct reversed pullup logic
        usb: dwc3: gadget: Fix incorrect DEPCMD and DGCMD status macros
        usb: phy: tahvo: Pass the IRQF_ONESHOT flag
        usb: phy: ab8500-usb: Pass the IRQF_ONESHOT flag
        usb: renesas_usbhs: Revise the binding document about the dma-names
        usb: host: xhci: add mutex for non-thread-safe data
        usb: make module xhci_hcd removable
        USB: serial: ftdi_sio: Add support for a Motion Tracker Development Board
        usb: gadget: f_midi: fix segfault when reading empty id
        phy: phy-rcar-gen2: Fix USBHS_UGSTS_LOCK value
        phy: omap-usb2: invoke pm_runtime_disable on error path
        phy: fix Kconfig dependencies
        ...
      e900f2c0
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux · be19c4ab
      Linus Torvalds authored
      Pull devicetree fix from Grant Likely:
       "Stupid typo fix for v4.1.  One of the IS_ENABLED() macro calls forgot
        the CONFIG_ prefix.  Only affects a tiny number of platforms, but
        still..."
      
      * tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
        of/dynamic: Fix test for PPC_PSERIES
      be19c4ab
  3. 06 Jun, 2015 10 commits
  4. 05 Jun, 2015 14 commits
  5. 04 Jun, 2015 3 commits