1. 15 Jul, 2014 35 commits
  2. 13 Jul, 2014 5 commits
    • Greg Kroah-Hartman's avatar
      Merge 3.16-rc5 into staging-next · 589e1d10
      Greg Kroah-Hartman authored
      We want the fixes in -rc5 in here as well.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      589e1d10
    • Linus Torvalds's avatar
      Linux 3.16-rc5 · 1795cd9b
      Linus Torvalds authored
      1795cd9b
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 18b34d9a
      Linus Torvalds authored
      Pull ext4 bugfixes from Ted Ts'o:
       "More bug fixes for ext4 -- most importantly, a fix for a bug
        introduced in 3.15 that can end up triggering a file system corruption
        error after a journal replay.
      
        It shouldn't lead to any actual data corruption, but it is scary and
        can force file systems to be remounted read-only, etc"
      
      * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: fix potential null pointer dereference in ext4_free_inode
        ext4: fix a potential deadlock in __ext4_es_shrink()
        ext4: revert commit which was causing fs corruption after journal replays
        ext4: disable synchronous transaction batching if max_batch_time==0
        ext4: clarify ext4_error message in ext4_mb_generate_buddy_error()
        ext4: clarify error count warning messages
        ext4: fix unjournalled bg descriptor while initializing inode bitmap
      18b34d9a
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-for-3.17c' of... · db7c17ec
      Greg Kroah-Hartman authored
      Merge tag 'iio-for-3.17c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
      
      Jonathan writes:
      
      3rd round of IIO new drivers, cleanups and functionality for the 3.17 cycle.
      
      New drivers
      * isl29125 digital color light sensor driver
      * TAOS/AMS tcs3414 digital color sensor
      
      Staging graduation
      * ad7291 ADC driver.
      
      New functionality
      * st_sensors - device tree support and bindings
      * mma8452 - device tree support
      
      Cleanups
      * Drop redundant variables in a number of drivers.
      * Reorder a structure definition to ealy wiht a warning about static
        not being at the beginning in the hid-sensors driver.
      * Switch a few more drivers away from using explicit sampling_frequency
        attribute to providing this through the core.
      * Make hid_sensor_get_reporting_interval static as only used within a single
        file.
      * Drop a redundant check for negative values in an unsigned variable from
        ad9832
      * Drop some duplicate case labels in the event monitor example code.
      * Use devm_ioremap_resource to simplify error handling.
      * Use devm_kzalloc within the blackfin timer driver to simplify error
        handling and removal.
      * A number of cleanups of the ad7291 from Hartmut Knaack in response
        to a patch moving it out of staging.
      * Core support for the period info element about events.  It has been
        in the abi for a while, but not added until now to the newer handling
        of information related to events.
      * Add HAS_IOMEM dependency to mxs_lradc to avoid build issues when testing
        enabled.
      db7c17ec
    • navin patidar's avatar