Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.

The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index f650e475d8f0..fdf2aad73470 100644
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@@ -60,10 +60,10 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
                                 gi->gid[i] = exp->ex_anon_gid;
                         else
                                 gi->gid[i] = rqgi->gid[i];
-
-                        /* Each thread allocates its own gi, no race */
-                        groups_sort(gi);
                 }
+
+                /* Each thread allocates its own gi, no race */
+                groups_sort(gi);
         } else {
                 gi = get_group_info(rqgi);
         }