2005-05-04 20:52:56

by Dave Kleikamp

[permalink] [raw]
Subject: [git pull] jfs update

Linus,
I think I've got this set up right. I have created a HEAD-for-linus and
HEAD-for-mm in the same git repo.

I've got one patch that I'd like in 2.6.12, and I've got some cleanups
that can just stay in -mm for now.

Please pull from

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus

This will update the following files:

fs/jfs/jfs_xtree.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

through these ChangeSets:

commit 6b6bf51081a27e80334e7ebe2993ae1d046a3222
tree 30c44cf22caf3bbe090f333460711f7719e848af
parent 8800cea62025a5209d110c5fa5990429239d6eee
author Dave Kleikamp <[email protected]> Wed, 04 May 2005 09:11:49 -0500
committer Dave Kleikamp <[email protected]> Wed, 04 May 2005 09:11:49 -0500

JFS: Endian errors

Thanks sparse!

Signed-off-by: Dave Kleikamp <[email protected]>


2005-05-04 21:40:13

by Linus Torvalds

[permalink] [raw]
Subject: Re: [git pull] jfs update



On Wed, 4 May 2005, Dave Kleikamp wrote:
>
> I think I've got this set up right. I have created a HEAD-for-linus and
> HEAD-for-mm in the same git repo.

Ok, my scripts don't handle that very well yet (they just want HEAD), but
that was easy enough to hack around. I'll be able to work with that
format.

> Please pull from
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus

Pulled, and pushed out.

Linus

2005-05-05 18:16:56

by Jeff Garzik

[permalink] [raw]
Subject: Re: [git pull] jfs update

Linus Torvalds wrote:
>
> On Wed, 4 May 2005, Dave Kleikamp wrote:
>
>>I think I've got this set up right. I have created a HEAD-for-linus and
>>HEAD-for-mm in the same git repo.
>
>
> Ok, my scripts don't handle that very well yet (they just want HEAD), but
> that was easy enough to hack around. I'll be able to work with that
> format.
>
>
>>Please pull from
>>
>>rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus


FWIW I'm definitely interested in some sort of pull mechanism where I
can say "pull from foo://.../libata-2.6.git/HEAD-for-linus" also.

With my netdev-2.6 queue, and given git's intrinsic abilities, I am
planning to keep all ~30 or so mini-branches in a single git tree. When
I am ready to push some upstream, I can do a HEAD-for-linus merge tree,
that merges selected branches.

Jeff


2005-05-05 18:20:29

by Linus Torvalds

[permalink] [raw]
Subject: Re: [git pull] jfs update



On Thu, 5 May 2005, Jeff Garzik wrote:
>
> FWIW I'm definitely interested in some sort of pull mechanism where I
> can say "pull from foo://.../libata-2.6.git/HEAD-for-linus" also.

I already changed my scripts to be able to do that. They default to HEAD,
but if you tell them something else, they'll get that instead.

So I'd do a

git-pull-script foo://.../libata-2.6.git/ HEAD-for-linus

except right now my pull script only works with rsync or ssh, not http.
I'll fix that up asap.

Linus

2005-05-05 20:14:10

by Dave Kleikamp

[permalink] [raw]
Subject: Re: [git pull] jfs update

On Thu, 2005-05-05 at 11:22 -0700, Linus Torvalds wrote:
>
> On Thu, 5 May 2005, Jeff Garzik wrote:
> >
> > FWIW I'm definitely interested in some sort of pull mechanism where I
> > can say "pull from foo://.../libata-2.6.git/HEAD-for-linus" also.
>
> I already changed my scripts to be able to do that. They default to HEAD,
> but if you tell them something else, they'll get that instead.
>
> So I'd do a
>
> git-pull-script foo://.../libata-2.6.git/ HEAD-for-linus
>
> except right now my pull script only works with rsync or ssh, not http.
> I'll fix that up asap.
>
> Linus
Andrew,
You can pull:

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-mm

whenever you do an -mm build. If your scripts have a problem with that,
you might try

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#for-mm

Let me know which you prefer.

Thanks,
Shaggy
--
David Kleikamp
IBM Linux Technology Center

2005-05-05 19:49:42

by Andrew Morton

[permalink] [raw]
Subject: Re: [git pull] jfs update

Dave Kleikamp <[email protected]> wrote:
>
> Andrew,
> You can pull:
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-mm
>
> whenever you do an -mm build. If your scripts have a problem with that,
> you might try
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#for-mm

Neither of those work for me, which I guess means that I have to go and
update all my git stuff, whcih will break every darn thing. Ho hum.

2005-05-06 19:13:44

by Dave Kleikamp

[permalink] [raw]
Subject: Re: [git pull] jfs update

On Thu, 2005-05-05 at 12:39 -0700, Andrew Morton wrote:
> Dave Kleikamp <[email protected]> wrote:
> >
> > Andrew,
> > You can pull:
> >
> > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-mm
> >
> > whenever you do an -mm build. If your scripts have a problem with that,
> > you might try
> >
> > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#for-mm
>
> Neither of those work for me, which I guess means that I have to go and
> update all my git stuff, whcih will break every darn thing. Ho hum.

If you haven't already, don't rush on my account. I don't need to put
anything in that tree newer than what I want in -mm, so you can use:

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git

In other words, I don't have any problem leaving HEAD equal to
HEAD-for-mm.
--
David Kleikamp
IBM Linux Technology Center