1. 08 Jan, 2014 25 commits
  2. 01 Jan, 2014 5 commits
  3. 24 Dec, 2013 2 commits
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-for-3.14b' of... · a6e8e3a4
      Greg Kroah-Hartman authored
      Merge tag 'iio-for-3.14b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
      
      Jonathan writes:
      
      2nd round of new IIO drivers, features and cleanups for the 3.14 cycle.
      
      New drivers
      
      * HID inclinometer driver.
      
      * DHT11 humidity driver.  Note that previous humidity drivers have been in
        hwmon, but no one was ever entirely happy with that, and they should find
        a more comfortable home in IIO (their original placement in hwmon was my
        fault - oops).  As this is our first humidity driver, core support is also
        added.
      
      New features
      
      * Two of mxs-lradc channels are internally wired to a temperature sensor,
        make this explicit in the driver by providing the relevant temperature
        channel.
      
      * Add support for blocking IO on buffers.
      
      * Add a data_available call back to the interface between buffer implementations
        and the core.  This is much cleaner than the old, 'stufftoread' flag.
        Implemented in the kfifo buffer.
      
      Cleanups
      
      * Last user of the old event configuration interface is converted and the
        old interface dropped.  Nice to be rid of this thanks to Lars-Peter's hard
        work!
      
      * Replace all remaining instances of the IIO_ST macro with explicit filling
        of the scan_type structure within struct iio_chan_spec.  This macro was a
        bad idea, that rapidly ceased to cover all elements of the structure.
        Miss reading of the macro arguements has led to a number of bugs so lets
        just get rid of it. The final removal patch is awaiting for some fixes
        to make their way into mainline.
        In a couple of drivers, no elements of scan_type were even being used so
        in those case, it has been dropped entirely.
      
      * Drop a couple of of_match_ptr helper uses in drivers where devicetree is
        not optional and hence the structures being protected by this always exist.
      
      * Fix up some cases where data was read from a device in a particular
        byte order, but he code placed it into a s16 or similar.  These were
        highlighted by Sparse.
      
      * Use the new ATTRIBUTE_GROUPS macro to drop some boiler plate in the triggers
        core code.
      
      * ad7746 and ad7280a - stop storing buffers on the stack, giving cleaner code
        and possibly avoiding issues with i2c bus drivers that assume they can dma
        directly into the buffer.  Note that this cannot currently happen as the the
        i2c_smbus_read_i2c_block_data function has a memcpy from the buffer actually
        passed to the bus driver.  I missed this element of the commit message
        and don't think it is major enough to rebase the iio tree.
      
      * ad5791 and ad5504 stop storing buffers on the stack for an SPI driver.
        Unlike the i2c drivers, this is a real issue for SPI drivers which can dma
        directly into the buffer supplied.
      a6e8e3a4
    • Greg Kroah-Hartman's avatar
      Merge 3.13-rc5 into staging-next · 912cbd49
      Greg Kroah-Hartman authored
      This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      912cbd49
  4. 22 Dec, 2013 8 commits
    • Linus Torvalds's avatar
      Linux 3.13-rc5 · 413541dd
      Linus Torvalds authored
      413541dd
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 93579aee
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Much smaller batch of fixes this week.
      
        Biggest one is a revert of an OMAP display change that removed some
        non-DT pinmux code that was still needed for 3.13 to get DSI displays
        to work.
      
        There's also a fix that resolves some misdescribed GPIO controller
        resources on shmobile.  The rest are mostly smaller fixes, a couple of
        MAINTAINERS updates, etc"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        Revert "ARM: OMAP2+: Remove legacy mux code for display.c"
        MAINTAINERS: Add keystone clock drivers
        MAINTAINERS: Add keystone git tree information
        ARM: s3c64xx: dt: Fix boot failure due to double clock initialization
        ARM: shmobile: r8a7790: Fix GPIO resources in DTS
        irqchip: renesas-intc-irqpin: Fix register bitfield shift calculation
        ARM: shmobile: lager: phy fixup needs CONFIG_PHYLIB
      93579aee
    • Linus Torvalds's avatar
      Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · ba8b844f
      Linus Torvalds authored
      Pull firewire fixlet from Stefan Richter:
       "A one-liner to reenable WRITE SAME over SBP-2 like in v3.8...v3.12.
        Buggy targets which could malfunction when being subjected to this
        command are already sufficiently protected by a scsi_level check in sd
        + SCSI core"
      
      * tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: sbp2: bring back WRITE SAME support
      ba8b844f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 1733348b
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       "Mostly minor items this time around, the most notable being a FILEIO
        backend change to enforce hw_max_sectors based upon the current
        block_size to address a bug where large sized I/Os (> 1M) where being
        rejected"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure
        target: Remove extra percpu_ref_init
        target/file: Update hw_max_sectors based on current block_size
        iser-target: Move INIT_WORK setup into isert_create_device_ib_res
        iscsi-target: Fix incorrect np->np_thread NULL assignment
        qla2xxx: Fix schedule_delayed_work() for target timeout calculations
        iser-target: fix error return code in isert_create_device_ib_res()
        iscsi-target: Fix-up all zero data-length CDBs with R/W_BIT set
        target: Remove write-only stats fields and lock from struct se_node_acl
        iscsi-target: return -EINVAL on oversized configfs parameter
      1733348b
    • Linus Torvalds's avatar
      Merge git://git.kvack.org/~bcrl/aio-next · a8472b4b
      Linus Torvalds authored
      Pull AIO leak fixes from Ben LaHaise:
       "I've put these two patches plus Linus's change through a round of
        tests, and it passes millions of iterations of the aio numa
        migratepage test, as well as a number of repetitions of a few simple
        read and write tests.
      
        The first patch fixes the memory leak Kent introduced, while the
        second patch makes aio_migratepage() much more paranoid and robust"
      
      * git://git.kvack.org/~bcrl/aio-next:
        aio/migratepages: make aio migrate pages sane
        aio: fix kioctx leak introduced by "aio: Fix a trinity splat"
      a8472b4b
    • Linus Torvalds's avatar
      aio: clean up and fix aio_setup_ring page mapping · 3dc9acb6
      Linus Torvalds authored
      Since commit 36bc08cc ("fs/aio: Add support to aio ring pages
      migration") the aio ring setup code has used a special per-ring backing
      inode for the page allocations, rather than just using random anonymous
      pages.
      
      However, rather than remembering the pages as it allocated them, it
      would allocate the pages, insert them into the file mapping (dirty, so
      that they couldn't be free'd), and then forget about them.  And then to
      look them up again, it would mmap the mapping, and then use
      "get_user_pages()" to get back an array of the pages we just created.
      
      Now, not only is that incredibly inefficient, it also leaked all the
      pages if the mmap failed (which could happen due to excessive number of
      mappings, for example).
      
      So clean it all up, making it much more straightforward.  Also remove
      some left-overs of the previous (broken) mm_populate() usage that was
      removed in commit d6c355c7 ("aio: fix race in ring buffer page
      lookup introduced by page migration support") but left the pointless and
      now misleading MAP_POPULATE flag around.
      Tested-and-acked-by: default avatarBenjamin LaHaise <bcrl@kvack.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3dc9acb6
    • Sachin Kamat's avatar
      staging: iio: hmc5843: Remove redundant of_match_ptr helper · 6fd92d3a
      Sachin Kamat authored
      'hmc5843_of_match' is always compiled in. Hence the helper
      macro is not needed.
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      6fd92d3a
    • Sachin Kamat's avatar
      iio: cm36651: Remove redundant of_match_ptr helper · a451521d
      Sachin Kamat authored
      'cm36651_of_match' is always compiled in. Hence the
      helper macro is not needed.
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      a451521d