1. 24 Feb, 2014 4 commits
    • Greg Kroah-Hartman's avatar
      Merge 3.14-rc4 into staging-next. · b4206006
      Greg Kroah-Hartman authored
      We want those fixes here as well.
      b4206006
    • Linus Torvalds's avatar
      Linux 3.14-rc4 · cfbf8d48
      Linus Torvalds authored
      cfbf8d48
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 72673429
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A collection of fixes for ARM platforms.  Most are fixes for DTS
        files, mostly from DT conversion on OMAP which is still finding a few
        issues here and there.
      
        There's a couple of small stale code removal patches that we usually
        queue for the next release instead, but they seemed harmless enough to
        bring in now.
      
        Also, a fix for backlight on some PXA platforms, and a cache
        configuration fix for Tegra, etc"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
        MAINTAINERS: add additional ARM BCM281xx/BCM11xxx maintainer
        ARM: tegra: only run PL310 init on systems with one
        ARM: tegra: Add head numbers to display controllers
        ARM: imx6: build pm-imx6q.c independently of CONFIG_PM
        ARM: tegra: fix RTC0 alias for Cardhu
        ARM: dove: dt: revert PMU interrupt controller node
        Documentation: dt: OMAP: Update Overo/Tobi
        ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
        ARM: dts: omap3-tobi: Use the correct vendor prefix
        ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
        ARM: OMAP2+: Remove legacy macros for zoom platforms
        ARM: OMAP2+: Remove MACH_NOKIA_N800
        ARM: dts: N900: add missing compatible property
        ARM: dts: N9/N950: fix boot hang with 3.14-rc1
        ARM: OMAP1: nokia770: enable tahvo-usb
        ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
        ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
        ARM: dts: omap3-gta04: Fix mmc1 properties.
        ARM: dts: omap3-gta04: Fix 'aux' gpio key flags.
        ARM: OMAP2+: add missing ARCH_HAS_OPP
        ...
      72673429
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 24c85258
      Linus Torvalds authored
      Pull regulator fixes from Mark Brown:
       "Mostly unexciting driver fixes, plus one fix to lower the severity of
        the log message when we don't use an optional regulator - the fixes
        for ACPI system made this come up more often and it was correctly
        observed that it was causing undue concern for users"
      
      * tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: max14577: Fix invalid return value on DT parse success
        regulator: core: Change dummy supplies error message to a warning
        regulator: s5m8767: Add missing of_node_put
        regulator: s5m8767: Use of_get_child_by_name
        regulator: da9063: Bug fix when setting max voltage on LDOs 5-11
      24c85258
  2. 23 Feb, 2014 12 commits
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b2880eb8
      Linus Torvalds authored
      Pull timer fix from Thomas Gleixner:
       "Serialize the registration of a new sched_clock in the currently ARM
        only generic sched_clock facilty to avoid sched_clock havoc"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched_clock: Prevent callers from seeing half-updated data
      b2880eb8
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 208937fd
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
      
       - a bugfix which prevents a divide by 0 panic when the newly introduced
         try_msr_calibrate_tsc() fails
      
       - enablement of the Baytrail platform to utilize the newfangled msr
         based calibration
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: tsc: Add missing Baytrail frequency to the table
        x86, tsc: Fallback to normal calibration if fast MSR calibration fails
      208937fd
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5fe37fcf
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "Another four fixlets to tame the ARM orion irq chip"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip: orion: Fix getting generic chip pointer.
        irqchip: orion: clear stale interrupts in irq_startup
        irqchip: orion: use handle_edge_irq on bridge irqs
        irqchip: orion: clear bridge cause register on init
      5fe37fcf
    • Linus Torvalds's avatar
      Merge tag 'usb-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · f9b08080
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are a number of USB fixes for reported issues for 3.14-rc4
      
        The majority of these are for USB gadget, phy, and musb driver issues.
        And there's a few new device ids thrown in for good measure"
      
      * tag 'usb-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb: chipidea: need to mask when writting endptflush and endptprime
        usb: musb: correct use of schedule_delayed_work()
        usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
        usb: gadget: fix NULL pointer dereference
        usb: gadget: printer: using gadget_is_otg to check otg support at runtime
        phy: let phy_provider_register be the last step in registering PHY
        phy-core: Don't allow building phy-core as a module
        phy-core: Don't propagate -ENOSUPP from phy_pm_runtime_get_sync to caller
        phy-core: phy_get: Leave error logging to the caller
        phy,phy-bcm-kona-usb2.c: Add dependency on HAS_IOMEM
        usb: musb: correct use of schedule_delayed_work()
        usb: musb: do not sleep in atomic context
        USB: serial: option: blacklist interface 4 for Cinterion PHS8 and PXS8
        USB: EHCI: add delay during suspend to prevent erroneous wakeups
        usb: gadget: bcm63xx_udc: fix build failure on DMA channel code
        usb: musb: do not sleep in atomic context
        usb: gadget: s3c2410_udc: Fix build error
        usb: musb: core: Fix remote-wakeup resume
        usb: musb: host: Fix SuperSpeed hub enumeration
        usb: musb: fix obex in g_nokia.ko causing kernel panic
      f9b08080
    • Linus Torvalds's avatar
      Merge tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · e0f13bd4
      Linus Torvalds authored
      Pull TTY revert from Greg KH:
       "Here is a single commit, a revert of a sysfs file change that ended up
        breaking a userspace tool"
      
      * tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Revert "tty: Set correct tty name in 'active' sysfs attribute"
      e0f13bd4
    • Linus Torvalds's avatar
      Merge tag 'staging-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · b9c2b050
      Linus Torvalds authored
      Pull staging tree fix from Greg KH:
       "Here is a single android driver fix for 3.14-rc4 that fixes a reported
        problem in the binder driver"
      
      * tag 'staging-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: binder: Fix death notifications
      b9c2b050
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 78349043
      Linus Torvalds authored
      Pull char/misc fix from Greg KH:
       "Here is a single commit, to fix a reported problem in the mei driver"
      
      * tag 'char-misc-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        mei: set client's read_cb to NULL when flow control fails
      78349043
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-for-3.15b' of... · aa256f8d
      Greg Kroah-Hartman authored
      Merge tag 'iio-for-3.15b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
      
      Jonathan writes:
      
      Second round of IIO new driver, functionality and cleanups for the 3.15 series.
      
      There are a few fixes in here that might, earlier in a cycle, have gone
      to Greg as fixes. Given they are either minor or have never actually
      been observed as causing trouble (the locking bug in the event code) and
      are invasive, I have included them in this pull request, targeting the
      3.15 merge window instead.
      
      The rest are pretty uncontroversial new drivers, a handy little tool for
      the example code in our documentation and little cleanups.
      
      New drivers
      * Freescale Vybrid and i.MX6SLX ADC driver.
      * HID Sensor hub proximity sensors.
      * HID Sensor hub pressure sensors.
      * LPS25H Pressure sensors added to the ST micro pressure sensor driver.
      
      New functionality
      * lsiio tool.  This is added to the staging tree as we haven't yet moved
        the example code it sits with out.  Moving this code out is now a reasonably
        high priority but holding up this tool in the meantime did not seem
        worthwhile.
      * mag3110 - add missing scale factor for temperature output to userspace.
      
      Cleanups
      * Fix a bug in the event reporting in which a spin lock might be held over
        when a sleep occured.  A similar bug was found by Lars in the buffer code.
        It has not to our knowledge been observed as actually occuring and is
        a little too invasive to push out as a fix.
      * Drop the IIO_ST macro after clearing out all users.  This macro was a very
        bad idea leading to a number of bugs after it stopped covering all elements
        of the structure being assigned and people started making assumptions about
        what it did cover.  Glad to see it go!
      * Avoid applying extended name to shared attributes as it makes no sense.
        No in tree drivers were using the combination, hence not pushed out as
        a fix.
      * ad799x - move to devm_request_threaded_irq to reduce boilerplate clean up.
      * bma180 - make the low_pass_filter_3db_frequency info element shared rather
        than per attribute.  The old approach was valid but not as clean as it might
        be and was setting a bad example.  Hence the cleanup.
      * mxs-lradc - propogate the error code form a platform_get_irq call rather than
        eating it up by returning -EINVAL on all errors.
      * ad799x - typo fix in the copyright message. Either that or Michael was
        asserting a copyright that moved backwards in time by about a thousand years.
      * ad799x - use a regulator for vref rather than platform data.  The driver
        dates from just as the regulator framework was coming into common use so
        provides an alternative way of specifying the reference voltage.  We no
        longer need that approach so drop it in favour of a regulator only approach.
      * max1363 - some internal vref values were out by a small amount.  The effect
        would have been tiny and no one noticed hence not pushing this through as
        a fix.
      * core - replace some pointless goto error_ret (with no clean up) lines with
        direct returns.  This is my bad coding style so I'm glad to see it cleaned
        up.
      * core - avoid a kasprintf that just directly prints a string with no
        formatting elements.  This has always been there but Lars just noticed it.
        Oops.
      aa256f8d
    • Lars-Peter Clausen's avatar
      iio:event: Fix and cleanup locking · b91accaf
      Lars-Peter Clausen authored
      The event code currently holds a spinlock with IRQs disabled while calling
      kfifo_to_user(). kfifo_to_user() can generate a page fault though, which means
      we have to be able to sleep, which is not possible if the interrupts are
      disabled. The good thing is that kfifo handles concurrent read and write access
      just fine as long as there is only one reader and one writer, so we do not any
      locking to protect against concurrent access from the read and writer thread. It
      is possible though that userspace is trying to read from the event FIFO from
      multiple concurrent threads, so we need to add locking to protect against this.
      This is done using a mutex. The mutex will only protect the kfifo_to_user()
      call, it will not protect the waitqueue. This means that multiple threads can be
      waiting for new data and once a new event is added to the FIFO all waiting
      threads will be woken up. If one of those threads is unable to read any data
      (because another thread already read all the data) it will go back to sleep. The
      only remaining issue is that now that the clearing of the BUSY flag and the
      emptying of the FIFO does no longer happen in one atomic step it is possible
      that a event is added to the FIFO after it has been emptied and this sample will
      be visible the next time a new event file descriptor is created. To avoid this
      rather move the emptying of the FIFO from iio_event_chrdev_release to
      iio_event_getfd().
      Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      b91accaf
    • Matt Porter's avatar
      MAINTAINERS: add additional ARM BCM281xx/BCM11xxx maintainer · a3db2bba
      Matt Porter authored
      Add myself as an additional maintainer for the Broadcom mobile
      SoCs.
      Signed-off-by: default avatarMatt Porter <mporter@linaro.org>
      Acked-by: default avatarChristian Daudt <bcm@fixthebug.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a3db2bba
    • Mark Brown's avatar
      Merge remote-tracking branches 'regulator/fix/da9063',... · bcad2ca3
      Mark Brown authored
      Merge remote-tracking branches 'regulator/fix/da9063', 'regulator/fix/max14577' and 'regulator/fix/s5m8767' into regulator-linus
      bcad2ca3
    • Mark Brown's avatar
  3. 22 Feb, 2014 10 commits
  4. 21 Feb, 2014 14 commits