diff --git a/[refs] b/[refs] index 22e4e22895d5..0a23ad1a978f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b004ff4972e2a42aa4512c90cc6a9e4dc1bb36b6 +refs/heads/master: c2c5a7051c556036b7beb8f4a89eefdc91c3245b diff --git a/trunk/lib/dynamic_debug.c b/trunk/lib/dynamic_debug.c index 2a29f4e04bdf..6b3ebabacfa8 100644 --- a/trunk/lib/dynamic_debug.c +++ b/trunk/lib/dynamic_debug.c @@ -634,7 +634,7 @@ int __dynamic_netdev_dbg(struct _ddebug *descriptor, dict, sizeof(dict)); res = printk_emit(0, 7, dictlen ? dict : NULL, dictlen, - "%s%s %s: %s: %pV", + "%s%s %s %s: %pV", dynamic_emit_prefix(descriptor, buf), dev_driver_string(dev->dev.parent), dev_name(dev->dev.parent), diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index ac890f14613a..cb9d43be07e7 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -6435,7 +6435,7 @@ static int __netdev_printk(const char *level, const struct net_device *dev, r = printk_emit(0, level[1] - '0', dictlen ? dict : NULL, dictlen, - "%s %s: %s: %pV", + "%s %s %s: %pV", dev_driver_string(dev->dev.parent), dev_name(dev->dev.parent), netdev_name(dev), vaf);