Merge branch 'master' into net-next

diff --cc ip/iproute.c
index ce90895b13ea995a5d99c3327814ea6ccf5d2da8,b137f555de0e76c8628a9b7ed36c755cfe66e997..8e4022b2d1271459f77d64fe860522829e8da5a4
--- 1/ip/iproute.c
--- 2/ip/iproute.c
+++ b/ip/iproute.c
@@@ -1671,10 -1642,8 +1671,10 @@@ static int iproute_get(int argc, char *
        if (req.r.rtm_family == AF_UNSPEC)
                req.r.rtm_family = AF_INET;
  
 +      req.r.rtm_flags |= RTM_F_LOOKUP_TABLE;
 +
        if (rtnl_talk(&rth, &req.n, &req.n, sizeof(req)) < 0)
-               exit(2);
+               return -2;
  
        if (connected && !from_ok) {
                struct rtmsg *r = NLMSG_DATA(&req.n);