merging ocfs2?

merging ocfs2?

[Zach Brown]

Hi Andrew, Linus,

Now that 2.6.15 has been released, can we merge ocfs2?  It's been in -mm
and as far as we know we've addressed all the concerns that were brought
up by reviewers.

To recap, it's a general purpose clustered file system -- it does not
have Oracle hooks or anything sneaky like that.

Joel has done the heavy lifting to bring its git repository up to date
so one should be able to pull from:

  http://oss.oracle.com/git/ocfs2.git

If there's anything further that is needed from us (Mark, Joel, myself),
please let us know.

- z

Re: merging ocfs2?

[Andrew Morton]

Zach Brown <zach.brown@oracle.com> wrote:
>
> Now that 2.6.15 has been released, can we merge ocfs2?
>

OK by me.  Christoph has been keeping a closer eye on outstanding issues
than I have?  

Re: merging ocfs2?

[Linus Torvalds]

On Tue, 3 Jan 2006, Zach Brown wrote:
>
> Joel has done the heavy lifting to bring its git repository up to date
> so one should be able to pull from:
> 
>   http://oss.oracle.com/git/ocfs2.git

If Christoph is happy with it, and there has been no grumbling from -mm, I 
can certainly merge it.

However, I really _really_ prefer that people who use git to merge use the 
native git protocol, which I trust. That http: thing may work, but it's a 
cludge ;)

Can you run git-daemon on the machine? 

		Linus

Re: merging ocfs2?

[Zach Brown]

Linus Torvalds wrote:
>
> On Tue, 3 Jan 2006, Zach Brown wrote:

>>  http://oss.oracle.com/git/ocfs2.git
>
> If Christoph is happy with it, and there has been no grumbling from -mm, I
> can certainly merge it.
>
> However, I really _really_ prefer that people who use git to merge use the
> native git protocol, which I trust. That http: thing may work, but it's a
> cludge ;)
>
> Can you run git-daemon on the machine?

Hmm, that's a good question.  I fear that machine is hiding in some firewalled
bunker somewhere.  Joel?

- z

Re: merging ocfs2?

[Wim Coekaerts]

> > Can you run git-daemon on the machine?
> 
> Hmm, that's a good question.  I fear that machine is hiding in some firewalled
> bunker somewhere.  Joel?

which we will get fixed. 

Re: merging ocfs2?

[Joel Becker]

On Wed, Jan 04, 2006 at 04:50:49PM -0800, Linus Torvalds wrote:
> However, I really _really_ prefer that people who use git to merge use the 
> native git protocol, which I trust. That http: thing may work, but it's a 
> cludge ;)
> 
> Can you run git-daemon on the machine? 

	Getting that port open is in progress.  http: is the for-now
solution.

Joel

-- 

"Practice random acts of kindness and senseless acts of beauty."

 Oh, and don't forget where your towel is.

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127

Re: merging ocfs2?

[Christoph Hellwig]

On Wed, Jan 04, 2006 at 04:50:49PM -0800, Linus Torvalds wrote:
> 
> 
> On Tue, 3 Jan 2006, Zach Brown wrote:
> >
> > Joel has done the heavy lifting to bring its git repository up to date
> > so one should be able to pull from:
> > 
> >   http://oss.oracle.com/git/ocfs2.git
> 
> If Christoph is happy with it, and there has been no grumbling from -mm, I 
> can certainly merge it.

Last time I looked it seemed fine.  That's been about a month ago and
I don't have time to look over it again currently.  I'd say merge it and
blame everything on me if something horrible is hidden inside now :)

Re: merging ocfs2?

[Wim Coekaerts]

On Wed, Jan 04, 2006 at 04:50:49PM -0800, Linus Torvalds wrote:
> On Tue, 3 Jan 2006, Zach Brown wrote:
> > Joel has done the heavy lifting to bring its git repository up to date
> > so one should be able to pull from:
> > 
> >   http://oss.oracle.com/git/ocfs2.git
> 
> If Christoph is happy with it, and there has been no grumbling from -mm, I 
> can certainly merge it.

Linus, the code has been carried in -mm since 2.6.12-rc4-mm1 and hch
just said he's fine with it - please merge when you can.

> However, I really _really_ prefer that people who use git to merge use the 
> native git protocol, which I trust. That http: thing may work, but it's a 
> cludge ;)
> 
> Can you run git-daemon on the machine? 

we will going forward - need to get some admins to do stuff, otherwise
if you want it from day 1 we can get it on kernel.org/git. but my guess
is that it will only be a little while and the first updates will come
through git-daemon (eg a week or so)

thanks
Wim