[pnfs] Error on git pull

[Iyer, Rahul]

I just noticed a problem while eliminating the merge conflicts... The
pNFS tree isn't a superset of the sessions tree (this is what I assumed
it would be). The one big difference is that _nfs4_proc_setup_sequence
is renamed to _nfs41_proc_setup_sequence in the 4.1-sessions branch. I
just wanted to bring this up in case it's an indicator of a greater
problem somewhere. 

To fix this, I can either:
1. Rename it in the 4.1-sessions branch
2. Rename it in master.

Which one would you guys prefer? Both will probably be similar amount of
work
Thanks
Regards
Rahul


> -----Original Message-----
> From: Iyer, Rahul [mailto:Rahul.Iyer at netapp.com] 
> Sent: Thursday, March 15, 2007 12:15 PM
> To: J. Bruce Fields
> Cc: pnfs at linux-nfs.org
> Subject: Re: [pnfs] Error on git pull
> 
> Oh... I just changed the git version I was using and the 
> merge worked fine (few conflicts, that's all). I'll send out 
> the patches soon and one they're applied I'll re clone (that 
> way I'll get Benny's changes as well).
> Thanks
> Rahul
>  
> 
> > -----Original Message-----
> > From: J. Bruce Fields [mailto:bfields at fieldses.org]
> > Sent: Thursday, March 15, 2007 12:13 PM
> > To: Iyer, Rahul
> > Cc: pnfs at linux-nfs.org
> > Subject: Re: [pnfs] Error on git pull
> > 
> > On Thu, Mar 15, 2007 at 11:17:03AM -0700, Iyer, Rahul wrote:
> > > My bad. I'm running 1.4. Apparently Gentoo doesn't have 
> 1.5 in its 
> > > portage tree... I'll build it from source from the link you sent.
> > > Thanks
> > 
> > OK, great.
> > 
> > The main difference is in the default setup that they produce on 
> > clone.
> > 
> > It's not hard to take a repository that was cloned using 1.4 and 
> > modify .git/config to give it the kind of setup 1.5 would 
> use, but it 
> > may be easiest just to re-clone.
> > 
> > --b.
> > 
> _______________________________________________
> pNFS mailing list
> pNFS at linux-nfs.org
> http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
>