[pnfs] git error with latest tree

[Rick McNeal]

Last night I pulled over a new pNFS tree with the following:
$ git clone git://git.linux-nfs.org/projects/bhalevy/linux-pnfs.git

This morning I attempted to checkout the latest block layout driver  
and received ...
$ git checkout -b pnfs-block origin/pnfs-block
fatal: Entry 'net/ipv4/netfilter/ipt_ECN.c' not uptodate. Cannot merge.

Does anyone know what git is trying to tell me?
----
Rick McNeal
rick.mcneal at lsi.com

A veteran is someone who, at one point in his life, wrote a blank  
check made payable to "The United States of America", for an amount of  
"up to and including my life." That is honor, and there are way too  
many people in this country who no longer understand it.
Author unknown.