On Jan 20, 2010, at 4:27 PM, Trond Myklebust wrote: > On Wed, 2010-01-20 at 16:06 -0500, andros@xxxxxxxxxx wrote: >> Resend with fix to compile without CONFIG_NFS_V4_1. >> >> Sorry 'bout that Trond. >> >> -->Andy > > No problem. However I did hit a conflict between your patchset and one > of Mike's. The conflicting patches were > > commit 8f4a598ccfa936dc850323859af8f52bb1ef15c1 nfs41: back channel drc > minimal implementation > > and > > commit f93f599e8f6f8c26a99beb8324b15bc8c5f3663a nfs41: Process > callback's referring call list > > > Could you please both check that I fixed it up correctly in the > nfsv41-for-next branch? Looks correct to me. -->Andy > > Cheers > Trond -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
