Hi Bruce-
I pulled from Linus's tree today, and found that Harvey's IP address print
formatters have already been merged. I had conflicts with some of the NSM
IPv6 patches I've already sent you that use the old NIP macros.
Here are the conflicting patches, updated to use Harvey's new formatters.
You may have already done some of this work to merge your NFSD tree into
linux-next, but I did update at least one patch description.
I have already updated the NFSD patches that are still pending, so you'll
get those changes when I resend that series.
---
Chuck Lever (5):
NSM: Move nsm_find() to fs/lockd/mon.c
NSM: Support IPv6 version of mon_name
NLM: Add helper to handle IPv4 addresses
NLM: Support IPv6 scope IDs in nlm_display_address()
NLM: Remove AF_UNSPEC arm in nlm_display_address()
fs/lockd/clntproc.c | 6 -
fs/lockd/host.c | 121 ------------
fs/lockd/mon.c | 411 +++++++++++++++++++++++++++++-----------
include/linux/lockd/lockd.h | 25 ++
include/linux/lockd/sm_inter.h | 31 ---
5 files changed, 322 insertions(+), 272 deletions(-)
--
Chuck Lever <chuck.lever@xxxxxxxxxx>
--
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
