Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
One conflict in the BPF samples Makefile, some fixes in 'net' whilst we were converting over to Makefile.target rules in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -376,8 +376,6 @@ static int smc_pnet_fill_entry(struct net *net,
|
||||
return 0;
|
||||
|
||||
error:
|
||||
if (pnetelem->ndev)
|
||||
dev_put(pnetelem->ndev);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user