On Tue, Sep 04, 2012 at 03:23:13AM -0600, Jan Schmidt wrote: > On Mon, September 03, 2012 at 18:31 (+0200), Suman C wrote: > > I am trying to integrate the quota patch from August 10th by Jan > > Schmidt and getting conflicts when I git apply. > > I've rebased it on top of Chris' current master, you can pull from > > git://git.jan-o-sch.net/btrfs-progs qgroup > > if you like. > > Chris: probably saves you some minutes too if you just pull that one :-) Thanks Jan, your qgroup branch is now in my master on kernel.org. -chris -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
