diff --git a/[refs] b/[refs] index 37a63cb04eae..f8a308da6fd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9b8706843a501034d09bea63ca6723a2ed02b11 +refs/heads/master: 7cecb523adedcaf8acba5e14d47559d8bc3f40d7 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 6df214041a5e..84f01ba81a34 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1136,8 +1136,8 @@ void dev_load(struct net *net, const char *name) no_module = request_module("netdev-%s", name); if (no_module && capable(CAP_SYS_MODULE)) { if (!request_module("%s", name)) - pr_err("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n", - name); + pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n", + name); } } EXPORT_SYMBOL(dev_load);