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
..
2017-12-19 09:28:01 +01:00
2017-10-11 14:24:24 +02:00
2017-11-02 11:10:55 +01:00
2017-11-04 09:26:51 +09:00
2018-01-15 11:35:06 +01:00
2018-01-15 09:34:45 +01:00
2017-02-08 09:15:59 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-12-11 12:19:21 +01:00
2017-11-24 22:18:37 +01:00
2015-12-04 14:43:32 +01:00
2016-11-17 08:46:38 +02:00
2016-01-27 20:36:03 +08:00
2017-11-21 15:57:07 -08:00
2017-12-19 09:28:01 +01:00
2017-11-02 11:10:55 +01:00
2017-12-11 12:19:31 +01:00
2018-01-19 22:59:33 -05:00
2017-11-04 09:26:51 +09:00
2015-12-04 14:43:32 +01:00
2017-01-06 14:01:13 +01:00
2016-02-24 09:04:41 +01:00
2017-11-02 11:10:55 +01:00
2018-01-15 09:15:03 +01:00
2017-10-11 14:24:24 +02:00
2017-12-19 10:37:31 +01:00
2017-11-04 09:26:51 +09:00
2017-03-29 09:11:29 +02:00
2017-11-02 11:10:55 +01:00
2012-10-18 10:53:37 +02:00
2017-12-11 12:19:31 +01:00
2017-11-04 09:26:51 +09:00
2018-01-18 15:36:18 -05:00
2015-02-28 21:31:09 +01:00
2017-06-14 13:52:44 +02:00
2018-01-16 15:01:33 -05:00
2017-11-02 11:10:55 +01:00
2012-05-09 20:49:19 -04:00