When I tried to bring my branch up to date, one of the older patches was rebased on top of V2.3-dev-0 (and others). I'm pretty sure this is wrong, and yields the wrong digests.
bill@simpson:~/rdma/nfs-ganesha$ git branch master rdma-mm * rdma-was up-next bill@simpson:~/rdma/nfs-ganesha$ git pull --rebase origin next From https://github.com/nfs-ganesha/nfs-ganesha * branch next -> FETCH_HEAD First, rewinding head to replay your work on top of it... Applying: Fix FATTR4_SUPPORTED_ATTRS Applying: Compile RDMA in Maintainer Mode Applying: nfs thread entry declarations Applying: Copy nfs_rpc_msk.c to _rdma.c Applying: Integrate NFS_RDMA bill@simpson:~/rdma/nfs-ganesha$ git remote -v lb g...@github.com:linuxbox2/nfs-ganesha.git (fetch) lb g...@github.com:linuxbox2/nfs-ganesha.git (push) origin https://github.com/nfs-ganesha/nfs-ganesha.git (fetch) origin https://github.com/nfs-ganesha/nfs-ganesha.git (push) bill@simpson:~/rdma/nfs-ganesha$ git log --oneline 6e05d59 Integrate NFS_RDMA 64a87da Copy nfs_rpc_msk.c to _rdma.c a72d2f2 nfs thread entry declarations 6913b3b Compile RDMA in Maintainer Mode 50cdd5f Fix FATTR4_SUPPORTED_ATTRS 97a9ea1 V2.3-dev-0 4b99ef8 V2.2.0 fe670c9 Update changelog for V2.2.0 52cf47f V2.2-rc-final f6767a5 Merge remote-tracking branch 'remotes/origin/late-fix' into next 62a48a0 Merge remote-tracking branch 'remotes/malahal/drain-list' into next cb07fae Merge remote-tracking branch 'remotes/martinetd/next' into next cc619d6 Fix CID 109573 - decode_filehandle must swizzle exportid in right place c960e85 Fix getgrnam_r failure with ERANGE error 83d06ec 9p dispatcher: don't set addr on accept() as we don't use it. 03ea2b6 Fix nfs4_op_layoutreturn to drop refs upon some failures 6f09e0e Fix never ending list traversal under some cases 054197b Merge remote-tracking branch 'remotes/linuxbox2/xdr-was' into next af84935 Merge remote-tracking branch 'remotes/marc/mixed-endian2' into next 0abb142 Add mixed endian support. b6c394e New file handle format. 795637a PanFS mds use proper XDR functions 79d7451 GPFS mds use proper XDR functions 8eaf24a V2.2-rc8 fc46abd Merge remote-tracking branch 'remotes/phdeniel/pull_request' into next fd785d7 Merge remote-tracking branch 'remotes/sivaprasad/next' into next 9bb459e Merge remote-tracking branch 'origin/for-rc8' into next a7c8d45 Merge remote-tracking branch 'malahal/rc8' into next c5cceb3 Don't waste memory in state_nlm_block_data_t 183dff6 Fix NFSv4 pseudo root attributes a202bc1 Exit with non-zero when invalid options are given. 296ac56 Fix mnt_Export to list only NFSv3 exports. 21a2b14 Fix options string based on the current code dbbc818 Remove -d option and add -F option 1444742 Let ganesha use configurable number of open file limit 8cd3cb4 init.d scripts: remove old ones, move current as appropriate 0681750 Dont respond with NFS4ERR_COMPLETE_ALREADY if client sends a rca_one_fs RECLAIM_COMPLETE ce720dc 9P: remove potentially pathological typo 1c9fca0 Fix for sqlite3 check_include_files() b0c8642 V2.2-rc7 ------------------------------------------------------------------------------ One dashboard for servers and applications across Physical-Virtual-Cloud Widest out-of-the-box monitoring support with 50+ applications Performance metrics, stats and reports that give you Actionable Insights Deep dive visibility with transaction tracing using APM Insight. http://ad.doubleclick.net/ddm/clk/290420510;117567292;y _______________________________________________ Nfs-ganesha-devel mailing list Nfs-ganesha-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel
