1. 08 2月, 2013 4 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 8d19514f
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "We've got corner cases for updating i_size that ceph was hitting,
        error handling for quotas when we run out of space, a very subtle
        snapshot deletion race, a crash while removing devices, and one
        deadlock between subvolume creation and the sb_internal code (thanks
        lockdep)."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: move d_instantiate outside the transaction during mksubvol
        Btrfs: fix EDQUOT handling in btrfs_delalloc_reserve_metadata
        Btrfs: fix possible stale data exposure
        Btrfs: fix missing i_size update
        Btrfs: fix race between snapshot deletion and getting inode
        Btrfs: fix missing release of the space/qgroup reservation in start_transaction()
        Btrfs: fix wrong sync_writers decrement in btrfs_file_aio_write()
        Btrfs: do not merge logged extents if we've removed them from the tree
        btrfs: don't try to notify udev about missing devices
      8d19514f
    • L
      Merge tag 'pinctrl-for-v3.8-late' of... · 95436ada
      Linus Torvalds 提交于
      Merge tag 'pinctrl-for-v3.8-late' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
      
      Pull late pinctrl fixes from Linus Walleij:
       "Two patches appeared as of late, one was completely news to me, the
        other one was rotated in -next for the next merge window but turned
        out to be a showstopper.
      
         - Exynos Kconfig fixup
         - SIRF DT translation bug"
      
      * tag 'pinctrl-for-v3.8-late' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: sirf: replace of_gpio_simple_xlate by sirf specific of_xlate
        pinctrl: exynos: change PINCTRL_EXYNOS option
      95436ada
    • L
      Merge tag 'stable/for-linus-3.8-rc6-tag' of... · a04521ab
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.8-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen fixes from Konrad Rzeszutek Wilk:
       "This has two fixes.  One is a security fix wherein we would spam the
        kernel printk buffer if one of the guests was misbehaving.  The other
        is much tamer and it was us only checking for one type of error from
        the IRQ subsystem (when allocating new IRQs) instead of for all of
        them.
      
         - Fix an IRQ allocation where we only check for a specific error (-1).
         - CVE-2013-0231 / XSA-43.  Make xen-pciback rate limit error messages
           from xen_pcibk_enable_msi{,x}()"
      
      * tag 'stable/for-linus-3.8-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: fix error handling path if xen_allocate_irq_dynamic fails
        xen-pciback: rate limit error messages from xen_pcibk_enable_msi{,x}()
      a04521ab
    • L
      Merge tag 'regulator-v3.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 3227e04e
      Linus Torvalds 提交于
      Pull regulator fixes from Mark Brown:
       "Mostly driver specific fixes here, though one of them uncovered the
        issue Stephen Warren fixed with multiple OF matches getting upset due
        to a lack of cleanup."
      
      * tag 'regulator-v3.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: s2mps11: fix incorrect register for buck10
        regulator: clear state each invocation of of_regulator_match
        regulator: max8997: Fix using wrong dev argument at various places
        regulator: max77686: Fix using wrong dev argument at various places
        regulator: max8907: Fix using wrong dev argument for calling of_regulator_match
        regulator: max8998: fix incorrect min_uV value for ldo10
        regulator: tps65910: Fix using wrong dev argument for calling of_regulator_match
        regulator: tps65217: Fix using wrong dev argument for calling of_regulator_match
      3227e04e
  2. 07 2月, 2013 3 次提交
    • L
      Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 6bacaa9d
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Just a couple of build regression fixes for ASoC fsl stuff.  It
        doesn't look too trivial, but neither intrusive, so hopefully I can
        avoid your curse..."
      
      Hey, Takashi has a good track record, I think he gets a pass..
      
      * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ASoC: fsl: fix snd-soc-imx-pcm module build
        Revert "ASoC: fsl: fix multiple definition of init_module"
      6bacaa9d
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 2110cf02
      Linus Torvalds 提交于
      Pull block layer updates from Jens Axboe:
       "I've got a few bits pending for 3.8 final, that I better get sent out.
        It's all been sitting for a while, I consider it safe.
      
        It contains:
      
         - Two bug fixes for mtip32xx, fixing a driver hang and a crash.
      
         - A few-liner protocol error fix for drbd.
      
         - A few fixes for the xen block front/back driver, fixing a potential
           data corruption issue.
      
         - A race fix for disk_clear_events(), causing spurious warnings.  Out
           of the Chrome OS base.
      
         - A deadlock fix for disk_clear_events(), moving it to the a
           unfreezable workqueue.  Also from the Chrome OS base."
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        drbd: fix potential protocol error and resulting disconnect/reconnect
        mtip32xx: fix for crash when the device surprise removed during rebuild
        mtip32xx: fix for driver hang after a command timeout
        block: prevent race/cleanup
        block: remove deadlock in disk_clear_events
        xen-blkfront: handle bvecs with partial data
        llist/xen-blkfront: implement safe version of llist_for_each_entry
        xen-blkback: implement safe iterator for the list of persistent grants
      2110cf02
    • C
      Btrfs: move d_instantiate outside the transaction during mksubvol · 1a65e24b
      Chris Mason 提交于
      Dave Sterba triggered a lockdep complaint about lock ordering
      between the sb_internal lock and the cleaner semaphore.
      
      btrfs_lookup_dentry() checks for orphans if we're looking up
      the inode for a subvolume, and subvolume creation is triggering
      the lookup with a transaction running.
      
      This commit moves the d_instantiate after the transaction closes.
      Signed-off-by: NChris Mason <chris.mason@fusionio.com>
      1a65e24b
  3. 06 2月, 2013 22 次提交
  4. 05 2月, 2013 11 次提交