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

net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.

net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'.  Thanks to David
Ahern for the heads up.

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

1 files changed, 9 insertions, 4 deletions

diff --git a/tools/testing/selftests/net/reuseport_bpf.c b/tools/testing/selftests/net/reuseport_bpf.c
index cad14cd0ea92..b5277106df1f 100644
--- a/tools/testing/selftests/net/reuseport_bpf.c
+++ b/tools/testing/selftests/net/reuseport_bpf.c
@@ -437,14 +437,19 @@ void enable_fastopen(void)
         }
 }
 
-static struct rlimit rlim_old, rlim_new;
+static struct rlimit rlim_old;
 
 static  __attribute__((constructor)) void main_ctor(void)
 {
         getrlimit(RLIMIT_MEMLOCK, &rlim_old);
-        rlim_new.rlim_cur = rlim_old.rlim_cur + (1UL << 20);
-        rlim_new.rlim_max = rlim_old.rlim_max + (1UL << 20);
-        setrlimit(RLIMIT_MEMLOCK, &rlim_new);
+
+        if (rlim_old.rlim_cur != RLIM_INFINITY) {
+                struct rlimit rlim_new;
+
+                rlim_new.rlim_cur = rlim_old.rlim_cur + (1UL << 20);
+                rlim_new.rlim_max = rlim_old.rlim_max + (1UL << 20);
+                setrlimit(RLIMIT_MEMLOCK, &rlim_new);
+        }
 }
 
 static __attribute__((destructor)) void main_dtor(void)