From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 1 Oct 2012 23:17:31 +0000 (-0700)
Subject: NFSv4: Fix up a merge conflict between migration and container changes
X-Git-Tag: v3.7-rc1~58^2~30
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f62387d6e26532bcbfb15606956074192ee526a;p=pandora-kernel.git

NFSv4: Fix up a merge conflict between migration and container changes

nfs_callback_tcpport is now per-net_namespace.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

Reading git-diff-tree failed