[GIT PULL] Btrfs updates for 2.6.37-rc

2010-11-29 Thread Chris Mason
Hi everyone, The master branch of the btrfs unstable tree: git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git master Has a collection of btrfs bug fixes. The three most important fixes here address crashes in the btrfs O_DIRECT code, add a migrate_page operation to avoid

[GIT PULL] Btrfs updates for 2.6.37

2010-10-30 Thread Chris Mason
Hi everyone, There were some minor conflicts with Linus' current tree, so my branch is merged with Linus' tree as of this morning. It includes some new writeback helpers so that btrfs can kick off IO to reclaim delalloc space. I bounced a few different interfaces off Christoph before this one.

Re: [GIT PULL] Btrfs updates for 2.6.37

2010-10-30 Thread Linus Torvalds
On Sat, Oct 30, 2010 at 6:51 AM, Chris Mason chris.ma...@oracle.com wrote: There were some minor conflicts with Linus' current tree, so my branch is merged with Linus' tree as of this morning. Gaah. Please don't do this. Unless it's a _really_ messy merge, I really do want to do the merge.