| commit | 1578b0a5e92825334760741e5c166b8873886f1b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jun 10 11:52:24 2016 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jun 10 11:52:24 2016 -0700 |
| tree | ac8299191f37990111f7d4b615601f4356e24fea | |
| parent | 3d5479e92087f6249231e26a2d7327e86a8d0dfc [diff] | |
| parent | 698ea54dde6768d4a96080d0fb796cb3a4eadaf8 [diff] |
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>