projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2afdfa5) | patch
NFSv4: Fix up a merge conflict between migration and container changes
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 1 Oct 2012 23:17:31 +0000 (16:17 -0700)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 1 Oct 2012 23:17:31 +0000 (16:17 -0700)
commit9f62387d6e26532bcbfb15606956074192ee526a
tree9102b0babaa7918bcc87f11a8986deee092be908tree | snapshot
parent2afdfa5a846246de50e1881f71ba5c0aac0b415fcommit | diff
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>
fs/nfs/nfs4state.c diff | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git