]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Feb 2009 18:37:00 +0000 (10:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Feb 2009 18:37:00 +0000 (10:37 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: try committing transaction before returning ENOSPC
  Btrfs: add better -ENOSPC handling


Trivial merge