xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2015-06-24 02:58:51 -07:00
parent 204621551b f1590670ce
commit 3a07bd6fea
29 changed files with 186 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/rocker/rocker.c
View File

@@ -5297,7 +5297,7 @@ static int __init rocker_module_init(void)
return 0;
err_pci_register_driver:
unregister_netdevice_notifier(&rocker_netevent_nb);
unregister_netevent_notifier(&rocker_netevent_nb);
unregister_netdevice_notifier(&rocker_netdevice_nb);
return err;
}