From: Chris Mason <chris.mason@fusionio.com>
To: Jan Schmidt <list.btrfs@jan-o-sch.net>
Cc: Suman C <schakrava@gmail.com>,
"linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>,
"Chris L. Mason" <clmason@fusionio.com>
Subject: Re: Btrfs-Progs integration branch question
Date: Tue, 4 Sep 2012 12:12:03 -0400 [thread overview]
Message-ID: <20120904161203.GB4013@shiny.int.fusionio.com> (raw)
In-Reply-To: <5045C881.40402@jan-o-sch.net>
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
prev parent reply other threads:[~2012-09-04 16:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-03 16:31 Btrfs-Progs integration branch question Suman C
2012-09-03 16:57 ` Hugo Mills
2012-09-04 9:23 ` Jan Schmidt
2012-09-04 16:12 ` Chris Mason [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120904161203.GB4013@shiny.int.fusionio.com \
--to=chris.mason@fusionio.com \
--cc=clmason@fusionio.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=list.btrfs@jan-o-sch.net \
--cc=schakrava@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).