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

Conflict was two parallel additions of include files to sch_generic.c, no biggie. Signed-off-by: David S. Miller <davem@davemloft.net>
2017-12-09 22:09:55 -05:00
parent 5e54b3c120 f335195adf
commit 51e18a453f
753 changed files with 7211 additions and 4566 deletions
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1106,7 +1106,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf)
 	 * when the name is long and there isn't enough space left
 	 * for the digits, or if all bits are used.
 	 */
-	return p ? -ENFILE : -EEXIST;
+	return -ENFILE;
 }

 static int dev_alloc_name_ns(struct net *net,