Re: integration tree updated

2014-08-04 Thread Chris Mason
On 08/01/2014 05:05 AM, Anand Jain wrote: Hi Chris, Looks like you missed Miao update (on 17 Jul) to back out the bad patch (below), and your integration branch (published on 25 Jul) still contains the same. [PATCH 2/2] Btrfs: fix wrong total device counter after removing a seed

Re: integration tree updated

2014-08-01 Thread Anand Jain
Hi Chris, Looks like you missed Miao update (on 17 Jul) to back out the bad patch (below), and your integration branch (published on 25 Jul) still contains the same. [PATCH 2/2] Btrfs: fix wrong total device counter after removing a seed device You should remove it. Simple test cases

Re: integration tree updated

2014-07-25 Thread Chris Mason
On 07/24/2014 10:16 PM, Qu Wenruo wrote: Hi chris, It seems that two of my wrong patches got merged in integration branch: 6068d17c8ab5bce946e9678ed2064e9f966cbe62 btrfs: Merge default subvolume mount codes into btrfs_mount_subvol(). 8a2166332e332541f13b34b7248c0f14f575731e btrfs: Call

integration tree updated

2014-07-24 Thread Chris Mason
Hi everyone, I've pushed out my current integration branch. It does have a few of Miao Xie's patches missing because there were some rejects. I think this was just because some things got pulled in out of order, and I'll get it fixed up. Also missing is Mark's quota snapshot deletion fixes.

Re: integration tree updated

2014-07-24 Thread Qu Wenruo
is given. These two patches does not completely work, and the successor patch is under review.(the show_path one) If it is OK for you, please remove these two patches. Thanks, Qu Original Message Subject: integration tree updated From: Chris Mason c...@fb.com To: linux-btrfs