From: David S. Miller <davem@davemloft.net>
Date: Tue, 29 Jul 2014 18:43:58 +0000 (-0700)
Subject: Merge branch 'netdev-name'
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~149^2~70
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=772e7023e61f32c8c334d420c6ce0ab1535dd080;p=pandora-kernel.git

Merge branch 'netdev-name'

Cong Wang says:

====================
net: forbid net devices named "all" "default" or "config"

/proc/sys/net/ipv[46]/conf/<dev> could conflict with
/proc/sys/net/ipv[46]/conf/(all|default). And /proc/net/vlan/<dev>
could conflict with /proc/net/vlan/config. Besides kernel warnings,
undefined behavior such as duplicated proc files also appears, therefore
we should forbid these names.

v2: introduce a helper function, suggested by Florian
    fix error handling for ipv6_add_dev() in addrconf_init()
====================

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

772e7023e61f32c8c334d420c6ce0ab1535dd080
Reading git-diff-tree failed