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-27 18:49:29 -07:00
2016-04-27 12:50:14 -04:00
2016-04-28 07:51:59 -06:00
2016-06-02 18:01:07 +01:00
2016-05-19 18:07:25 -07:00
2016-05-20 17:58:30 -07:00
2016-05-14 10:12:45 -06:00
2016-04-28 07:47:35 -06:00
2016-05-05 15:25:54 -04:00
2016-06-10 11:52:24 -07:00
2016-05-31 22:16:53 +05:30
2016-05-20 22:20:48 -07:00
2016-05-10 12:05:27 +03:00
2016-05-11 21:54:05 +10:00
2016-06-05 10:36:01 -07:00
2016-04-28 07:51:59 -06:00
2016-04-27 10:23:44 +02:00
2016-05-26 09:48:23 -07:00
2016-05-04 22:40:02 +02:00
2016-05-28 11:04:16 -07:00
2016-05-10 17:30:14 +02:00
2016-06-03 15:06:22 -07:00
2016-04-28 07:21:48 -06:00
2016-05-17 12:06:35 +02:00
2016-04-28 10:40:57 +02:00
2016-06-07 16:37:14 -07:00
2016-04-28 07:23:59 -06:00
2016-05-19 18:07:25 -07:00
2016-05-28 12:04:17 -07:00
2016-06-03 16:14:34 +10:00
2016-05-20 20:57:27 -07:00
2016-05-08 11:27:44 +02:00
2016-05-25 17:05:40 -07:00
2016-05-10 01:19:26 -07:00
2016-05-17 07:28:24 -07:00
2016-04-28 07:51:59 -06:00
2016-05-20 21:20:31 -07:00
2016-05-04 10:25:58 -07:00
2016-05-19 18:07:25 -07:00
2016-05-11 22:37:54 +02:00
2016-05-20 17:58:30 -07:00
2016-05-01 14:37:49 -07:00
2016-05-14 18:28:29 +02:00
2016-05-19 18:07:25 -07:00
2016-04-28 07:15:36 -06:00
2016-05-23 17:04:14 -07:00
2016-05-02 09:32:04 -07:00
2016-05-20 20:57:27 -07:00
2016-04-28 07:23:11 -06:00
2016-05-09 18:34:37 -03:00
2016-05-04 12:39:35 -07:00
2016-04-28 10:57:51 +02:00
2016-05-19 19:12:14 -07:00
2016-04-29 16:39:39 +02:00
2016-05-17 14:48:04 +02:00
2016-04-28 07:26:41 -06:00
2016-05-06 11:09:01 -07:00
2016-04-29 17:37:10 -07:00
2016-04-28 08:02:36 -06:00
2016-04-28 07:44:54 -06:00
1578b0a5e9
