[pnfs] Error on git pull

[J. Bruce Fields]

On Tue, Mar 13, 2007 at 05:31:34PM -0700, Marc Eshel wrote:
> I see that my first set of changes for exchange_id are in master and are 
> not in 4.1-sessions

Whoops.  Which do you think those belong in?  Could you help sort this
out?

> so why should the rest of the fix got to 4.1-sessions 
> ? The last patch that I sent "[pnfs] [PATCH] update exchange id reply to 
> draft 9" does apply cleanly on the master so I am not sure what is the 
> problem ?

OK, I think I misunderstood something here: I looked at that patch, saw
that it was patching purely sessions-related structures, so thought it
should get thrown in the sessions branch.

But now I see that the implementation_id stuff that it's removing is
actually introduced in our pnfs patch.  Which means Andy and I messed up
when we split out the sessions stuff--any changes to core exchange_id
stuff should obviously have ended up in the sessions branch.

So, OK, applying your patch takes us one step in the right direction--by
removing something from the pnfs branch that never should have been
there in the first place.  OK, applied.

But obviously more work needs to be done before we have the sessions
stuff separated out properly.

--b.