Re: [GIT PULL] a large btrfs update

2012-07-26 Thread Linus Torvalds
On Thu, Jul 26, 2012 at 2:09 PM, Chris Mason wrote: > > for-linus-merged has an extra commit on top as well that changes the > btrfs send/receive code to Al's new dentry_open. It's a small commit, > and my guess is that you'll cherry pick it and do your own merge. Indeed. And I dd the semantic

[GIT PULL] a large btrfs update

2012-07-26 Thread Chris Mason
Hi Linus, Since this has a conflict, I've split it into two branches. # against 3.5, my diffstat is based on this branch git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus # against your git as of today

[GIT PULL] a large btrfs update

2012-07-26 Thread Chris Mason
Hi Linus, Since this has a conflict, I've split it into two branches. # against 3.5, my diffstat is based on this branch git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus # against your git as of today

Re: [GIT PULL] a large btrfs update

2012-07-26 Thread Linus Torvalds
On Thu, Jul 26, 2012 at 2:09 PM, Chris Mason chris.ma...@fusionio.com wrote: for-linus-merged has an extra commit on top as well that changes the btrfs send/receive code to Al's new dentry_open. It's a small commit, and my guess is that you'll cherry pick it and do your own merge. Indeed.