1. 04 Jun, 2013 24 commits
  2. 20 May, 2013 10 commits
  3. 19 May, 2013 3 commits
  4. 18 May, 2013 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 130901ba
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "Miao Xie has been very busy, fixing races and enospc problems and many
        other small but important pieces.
      
        Alexandre Oliva discovered some problems with how our error handling
        was interacting with the block layer and for now has disabled our
        partial handling of sub-page writes.  The real sub-page work is in a
        series of patches from IBM that we still need to integrate and test.
        The code Alexandre has turned off was really incomplete.
      
        Josef has more error handling fixes and an important fix for the new
        skinny extent format.
      
        This also has my fix for the tracepoint crash from late in 3.9.  It's
        the first stage in a larger clean up to get rid of btrfs_bio and make
        a proper bioset for all the items we need to tack into the bio.  For
        now the bioset only holds our mirror_num and stripe_index, but for the
        next merge window I'll shuffle more in."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (25 commits)
        Btrfs: use a btrfs bioset instead of abusing bio internals
        Btrfs: make sure roots are assigned before freeing their nodes
        Btrfs: explicitly use global_block_rsv for quota_tree
        btrfs: do away with non-whole_page extent I/O
        Btrfs: don't invoke btrfs_invalidate_inodes() in the spin lock context
        Btrfs: remove BUG_ON() in btrfs_read_fs_tree_no_radix()
        Btrfs: pause the space balance when remounting to R/O
        Btrfs: fix unprotected root node of the subvolume's inode rb-tree
        Btrfs: fix accessing a freed tree root
        Btrfs: return errno if possible when we fail to allocate memory
        Btrfs: update the global reserve if it is empty
        Btrfs: don't steal the reserved space from the global reserve if their space type is different
        Btrfs: optimize the error handle of use_block_rsv()
        Btrfs: don't use global block reservation for inode cache truncation
        Btrfs: don't abort the current transaction if there is no enough space for inode cache
        Correct allowed raid levels on balance.
        Btrfs: fix possible memory leak in replace_path()
        Btrfs: fix possible memory leak in the find_parent_nodes()
        Btrfs: don't allow device replace on RAID5/RAID6
        Btrfs: handle running extent ops with skinny metadata
        ...
      130901ba
    • Linus Torvalds's avatar
      Merge branch 'devm_no_resource_check' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · e5106682
      Linus Torvalds authored
      Pull devm usage cleanup from Wolfram Sang:
       "Lately, I have been experimenting how to improve the devm interface to
        make writing device drivers easier and less error prone while also
        getting rid of its subtle issues.  I think it has more potential but
        still needs work and definately conistency, especiall in its usage.
      
        The first thing I come up with is a low hanging fruit regarding
        devm_ioremap_resouce().  This function already checks if the passed
        resource is valid and gives an error message if not.  So, we can
        remove similar checks from the drivers and get rid of a bit of code
        and a number of inconsistent error strings.
      
        This series only removes the unneeded check iff devm_ioremap_resource
        follows platform_get_resource directly.  The previous version tried to
        shuffle code if needed, too, what lead to an embarrasing bug.  It
        turned out to me that shuffling code for all cases found will make the
        automated script too complex, so I am unsure if an automated cleanup
        is the proper tool for this case.  Removing the easy stuff seems
        worthwhile to me, though.
      
        Despite various architectures and platform dependencies, I managed to
        compile test 45 out of 57 modified files locally using heuristics and
        defconfigs."
      
      Pulled because: 296 deletions, 0 additions.
      
      * 'devm_no_resource_check' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (33 commits)
        sound/soc/kirkwood: don't check resource with devm_ioremap_resource
        sound/soc/fsl: don't check resource with devm_ioremap_resource
        arch/mips/lantiq/xway: don't check resource with devm_ioremap_resource
        arch/arm/plat-samsung: don't check resource with devm_ioremap_resource
        arch/arm/mach-tegra: don't check resource with devm_ioremap_resource
        drivers/watchdog: don't check resource with devm_ioremap_resource
        drivers/w1/masters: don't check resource with devm_ioremap_resource
        drivers/video/omap2/dss: don't check resource with devm_ioremap_resource
        drivers/video/omap2: don't check resource with devm_ioremap_resource
        drivers/usb/phy: don't check resource with devm_ioremap_resource
        drivers/usb/host: don't check resource with devm_ioremap_resource
        drivers/usb/gadget: don't check resource with devm_ioremap_resource
        drivers/usb/chipidea: don't check resource with devm_ioremap_resource
        drivers/thermal: don't check resource with devm_ioremap_resource
        drivers/staging/nvec: don't check resource with devm_ioremap_resource
        drivers/staging/dwc2: don't check resource with devm_ioremap_resource
        drivers/spi: don't check resource with devm_ioremap_resource
        drivers/rtc: don't check resource with devm_ioremap_resource
        drivers/pwm: don't check resource with devm_ioremap_resource
        drivers/pinctrl: don't check resource with devm_ioremap_resource
        ...
      e5106682
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux · ff9129b0
      Linus Torvalds authored
      Pull device tree fixes from Grant Likely:
       "Device tree bug fixes and documentation updates for v3.10
      
        Nothing earth shattering here.  A build failure fix, and fix for
        releasing nodes and some documenation updates."
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
        Documentation/devicetree: make semantic of initrd-end more explicit
        of/base: release the node correctly in of_parse_phandle_with_args()
        of/documentation: move video device bindings to a common place
        <linux/of_platform.h>: fix compilation warnings with DT disabled
      ff9129b0