David S. Miller 1578b0a5e9
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
net/sched/act_police.c
net/sched/sch_drr.c
net/sched/sch_hfsc.c
net/sched/sch_prio.c
net/sched/sch_red.c
net/sched/sch_tbf.c
In net-next the drop methods of the packet schedulers got removed, so
the bug fixes to them in 'net' are irrelevant.
A packet action unload crash fix conflicts with the addition of the
new firstuse timestamp.
Signed-off-by: David S. Miller <davem@davemloft.net >
2016-06-10 11:52:24 -07:00
2016-05-24 11:00:20 -07:00
2016-05-30 23:00:22 +02:00
2016-06-02 17:59:44 +01:00
2016-05-28 12:32:01 -07:00
2016-06-10 08:32:24 -07:00
2016-05-26 09:36:10 -07:00
2016-06-09 22:21:29 -07:00
2016-06-08 11:11:00 -07:00
2016-05-28 16:15:25 -07:00
2016-06-04 21:32:40 -04:00
2016-05-23 17:53:39 -07:00
2016-06-07 22:07:09 -04:00
2016-05-26 19:34:26 -07:00
2016-06-01 14:56:57 -07:00
2016-06-02 23:05:27 +02:00
2016-05-26 20:00:28 -07:00
2016-05-28 16:15:25 -07:00
2016-06-05 10:36:01 -07:00
2016-05-31 22:12:43 +05:30
2016-05-27 16:03:22 -07:00
2016-05-31 22:17:05 +05:30
2016-05-27 17:14:05 -07:00
2016-06-01 10:29:39 +02:00
2016-05-28 15:48:31 -04:00
2016-06-09 23:34:42 -07:00
2016-05-23 17:04:14 -07:00
2016-05-25 16:12:05 +02:00
2016-05-27 15:23:32 -07:00
2016-05-26 15:35:44 -07:00
2016-05-27 15:57:31 -07:00
2016-06-05 10:36:01 -07:00
2016-06-03 19:37:21 -04:00
2016-06-09 13:28:37 -07:00
2016-05-26 10:33:33 -07:00
2016-05-23 17:04:14 -07:00
2016-06-03 15:06:22 -07:00
2016-05-25 17:05:40 -07:00
2016-05-31 22:12:43 +05:30
2016-05-26 00:04:58 -04:00
2016-06-09 23:30:12 -07:00
2016-05-26 15:35:44 -07:00
2016-05-31 11:59:06 -07:00
2016-05-26 15:35:44 -07:00
2016-05-23 17:04:14 -07:00
2016-06-03 19:37:21 -04:00
2016-05-26 15:35:44 -07:00
2016-05-28 15:42:50 -04:00
2016-06-01 21:13:43 +02:00
2016-05-23 17:04:14 -07:00
2016-05-27 20:09:16 -04:00
1578b0a5e9