* Btrfs-Progs integration branch question
@ 2012-09-03 16:31 Suman C
2012-09-03 16:57 ` Hugo Mills
2012-09-04 9:23 ` Jan Schmidt
0 siblings, 2 replies; 4+ messages in thread
From: Suman C @ 2012-09-03 16:31 UTC (permalink / raw)
To: linux-btrfs
Hi,
I would like to get the latest btrfs-progs code. To me, Chris Mason's
repo at git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
seems latest but obviously its missing the last several patches I see
in the mailing list. I also tried Hugo Mills' integration repo at
http://git.darksatanic.net/repo/btrfs-progs-unstable.git and unless I
am looking at it wrong, it seems behind.
Can someone please point me to the latest process that is followed for
testing/developing recent btrfs-progs?
I am trying to integrate the quota patch from August 10th by Jan
Schmidt and getting conflicts when I git apply.
Thanks
Suman
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Btrfs-Progs integration branch question
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
1 sibling, 0 replies; 4+ messages in thread
From: Hugo Mills @ 2012-09-03 16:57 UTC (permalink / raw)
To: Suman C; +Cc: linux-btrfs
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
On Mon, Sep 03, 2012 at 09:31:16AM -0700, Suman C wrote:
> Hi,
>
> I would like to get the latest btrfs-progs code. To me, Chris Mason's
> repo at git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
> seems latest but obviously its missing the last several patches I see
> in the mailing list. I also tried Hugo Mills' integration repo at
> http://git.darksatanic.net/repo/btrfs-progs-unstable.git and unless I
> am looking at it wrong, it seems behind.
It is. I'm out of date.
> Can someone please point me to the latest process that is followed for
> testing/developing recent btrfs-progs?
Chris's repo, right now.
> I am trying to integrate the quota patch from August 10th by Jan
> Schmidt and getting conflicts when I git apply.
Good luck. :)
Hugo.
--
=== Hugo Mills: hugo@... carfax.org.uk | darksatanic.net | lug.org.uk ===
PGP key: 515C238D from wwwkeys.eu.pgp.net or http://www.carfax.org.uk
--- What do you give the man who has everything? -- Penicillin is ---
a good start...
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 190 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Btrfs-Progs integration branch question
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
1 sibling, 1 reply; 4+ messages in thread
From: Jan Schmidt @ 2012-09-04 9:23 UTC (permalink / raw)
To: Suman C; +Cc: linux-btrfs, Chris Mason
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 :-)
-Jan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Btrfs-Progs integration branch question
2012-09-04 9:23 ` Jan Schmidt
@ 2012-09-04 16:12 ` Chris Mason
0 siblings, 0 replies; 4+ messages in thread
From: Chris Mason @ 2012-09-04 16:12 UTC (permalink / raw)
To: Jan Schmidt; +Cc: Suman C, linux-btrfs@vger.kernel.org, Chris L. Mason
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-04 16:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).