[pnfs] Error on git pull

[J. Bruce Fields]

On Tue, Mar 13, 2007 at 10:37:04AM -0400, J. Bruce Fields wrote:
> On Mon, Mar 12, 2007 at 05:01:31PM -0700, Iyer, Rahul wrote:
> > I got the error below on git pull. Is this because your merge is in
> > progress?
> 
> Sorry about that; I should have warned you (and talked this over with
> Andy) before making it public.  So there's now two branches:
> 
> 	master (the default branch): has pNFS and and sessions
> 	4.1-sessions: sessions only

By the way, after setting that up I also took a look at the
implementation-id-removal patch that's outstanding from Marc, as I did
promise I'd help incorporate any work done in the meantime....
Unfortunately that's one of the tricky cases where most of the changes
belong in 4.1-sessions, so I might need a little help there.

--b.