1. 24 Apr, 2014 4 commits
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 76429f1d
      Linus Torvalds authored
      Pull regulator fixes from Mark Brown:
       "A couple of things here:
      
         - Fixes for pbias that didn't make it in during the merge window due
           to the driver coming in via MMC.  The conversion to use helpers is
           a fix as it implements list_voltage() which the main user (MMC)
           relies on for correct functioning.
         - Change the !REGULATOR stub for optional regulators to return an
           error rather than a dummy; this is more in keeping with the
           intended use of optional regulators and fixes some issues seen MMC
           where it got confused by a dummy being provided"
      
      * tag 'regulator-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: core: Return error in get optional stub
        regulator: pbias: Convert to use regmap helper functions
        regulator: pbias: Fix is_enabled callback implementation
      76429f1d
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · ff1e5b44
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "A few driver specific fixes here:
      
         - SH HSPI was dealing with its clocks incorrectly which meant it
           didn't work on some SoCs, fixing this also requires a small fix to
           one of the SoC clock trees to avoid breaking existing users.
         - The SiRF driver appears to have had several quality problems, it's
           fairly new and not widely used so this isn't too worrying.
         - A brute force fix for excessive locking in the Atmel driver, it
           needs further investigation but this deals with the immediate
           issue.
         - A build fix for the Blackfin driver"
      
      * tag 'spi-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: atmel: Fix scheduling while atomic bug
        spi: sh-hspi: Do not specifically request shyway_clk clock
        ARM: shmobile: r8a7778: Use clks as MSTP007 parent
        spi: sirf: make GPIO chipselect function work well
        spi: sirf: set SPI controller in RISC IO chipselect mode
        spi: sirf: correct TXFIFO empty interrupt status bit
        spi: bfin5xx: fix build error
      ff1e5b44
    • Linus Torvalds's avatar
      Merge branch 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 92891ed6
      Linus Torvalds authored
      Pull dma-mapping fix from Marek Szyprowski:
       "A small fix for dma-mapping subsystem for ARM"
      
      * 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        arm: dma-mapping: Fix mapping size value
      92891ed6
    • Linus Torvalds's avatar
      Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · fdd324aa
      Linus Torvalds authored
      Pull libata fixes from Tejun Heo:
       "Dan updated tag allocation to accomodate devices which choke when tags
        jump back and forth.  Quite a few ahci MSI related fixes.  A couple
        config dependency fixes and other misc fixes"
      
      * 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        libata/ahci: accommodate tag ordered controllers
        ahci: Do not receive interrupts sent by dummy ports
        ahci: Use pci_enable_msi_exact() instead of pci_enable_msi_range()
        ahci: Ensure "MSI Revert to Single Message" mode is not enforced
        ahci: do not request irq for dummy port
        pata_samsung_cf: fix ata_host_activate() failure handling
        pata_arasan_cf: fix ata_host_activate() failure handling
        ata: fix i.MX AHCI driver dependencies
        pata_at91: fix ata_host_activate() failure handling
        libata: Update queued trim blacklist for M5x0 drives
        libata: make AHCI_XGENE depend on PHY_XGENE
      fdd324aa
  2. 23 Apr, 2014 11 commits
  3. 22 Apr, 2014 14 commits
  4. 21 Apr, 2014 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · c089b229
      Linus Torvalds authored
      Pull UML fixes from Richard Weinberger:
       "Assorted fixes for UML"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: Memory corruption on startup
        um: Missing pipe handling
        uml: Simplify tempdir logic.
      c089b229
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 9ac03675
      Linus Torvalds authored
      Pull ext4 fixes from Ted Ts'o:
       "These are regression and bug fixes for ext4.
      
        We had a number of new features in ext4 during this merge window
        (ZERO_RANGE and COLLAPSE_RANGE fallocate modes, renameat, etc.) so
        there were many more regression and bug fixes this time around.  It
        didn't help that xfstests hadn't been fully updated to fully stress
        test COLLAPSE_RANGE until after -rc1"
      
      * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (31 commits)
        ext4: disable COLLAPSE_RANGE for bigalloc
        ext4: fix COLLAPSE_RANGE failure with 1KB block size
        ext4: use EINVAL if not a regular file in ext4_collapse_range()
        ext4: enforce we are operating on a regular file in ext4_zero_range()
        ext4: fix extent merging in ext4_ext_shift_path_extents()
        ext4: discard preallocations after removing space
        ext4: no need to truncate pagecache twice in collapse range
        ext4: fix removing status extents in ext4_collapse_range()
        ext4: use filemap_write_and_wait_range() correctly in collapse range
        ext4: use truncate_pagecache() in collapse range
        ext4: remove temporary shim used to merge COLLAPSE_RANGE and ZERO_RANGE
        ext4: fix ext4_count_free_clusters() with EXT4FS_DEBUG and bigalloc enabled
        ext4: always check ext4_ext_find_extent result
        ext4: fix error handling in ext4_ext_shift_extents
        ext4: silence sparse check warning for function ext4_trim_extent
        ext4: COLLAPSE_RANGE only works on extent-based files
        ext4: fix byte order problems introduced by the COLLAPSE_RANGE patches
        ext4: use i_size_read in ext4_unaligned_aio()
        fs: disallow all fallocate operation on active swapfile
        fs: move falloc collapse range check into the filesystem methods
        ...
      9ac03675
  5. 20 Apr, 2014 9 commits