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/netdev/net

Browse Source 
Merge conflict of mlx5 resolved using instructions in merge
commit 9566e650bf.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2019-08-19 11:54:03 -07:00
parent 20e79a0a2c 06821504fd
commit 446bf64b61
549 changed files with 4710 additions and 2902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/sched/sch_taprio.c
View File

@@ -1191,7 +1191,8 @@ unlock:
spin_unlock_bh(qdisc_lock(sch));
free_sched:
kfree(new_admin);
if (new_admin)
call_rcu(&new_admin->rcu, taprio_free_sched_cb);
return err;
}