From: David S. Miller Date: Tue, 29 Jul 2014 18:43:58 +0000 (-0700) Subject: Merge branch 'netdev-name' X-Git-Tag: v3.17-rc1~106^2~70 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=772e7023e61f32c8c334d420c6ce0ab1535dd080;p=linux.git Merge branch 'netdev-name' Cong Wang says: ==================== net: forbid net devices named "all" "default" or "config" /proc/sys/net/ipv[46]/conf/ could conflict with /proc/sys/net/ipv[46]/conf/(all|default). And /proc/net/vlan/ 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 --- 772e7023e61f32c8c334d420c6ce0ab1535dd080