Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in bug fixes before respinning my net-next pull request. Signed-off-by: David S. Miller <davem@davemloft.net>
这个提交包含在:
@@ -1024,7 +1024,8 @@ static int __init net_ns_init(void)
|
||||
init_net_initialized = true;
|
||||
up_write(&pernet_ops_rwsem);
|
||||
|
||||
register_pernet_subsys(&net_ns_ops);
|
||||
if (register_pernet_subsys(&net_ns_ops))
|
||||
panic("Could not register network namespace subsystems");
|
||||
|
||||
rtnl_register(PF_UNSPEC, RTM_NEWNSID, rtnl_net_newid, NULL,
|
||||
RTNL_FLAG_DOIT_UNLOCKED);
|
||||
|
在新工单中引用
屏蔽一个用户