linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 23:29:46 +00:00

History

David S. Miller 8565d26bcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The BPF verifier conflict was some minor contextual issue.

The TUN conflict was less trivial.  Cong Wang fixed a memory leak of
tfile->tx_array in 'net'.  This is an skb_array.  But meanwhile in
net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
ptr_ring.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-01-19 22:59:33 -05:00

af_netlink.c

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

2018-01-19 22:59:33 -05:00

af_netlink.h

af_netlink: ensure that NLMSG_DONE never fails in dumps

2017-11-13 10:17:13 +09:00

diag.c

rhashtable: Change rhashtable_walk_start to return void

2017-12-11 09:58:38 -05:00

genetlink.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license