| commit | 92595aea8a4b82c5b2d3b4fc1c0982861e24873c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jun 10 18:00:57 2016 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jun 10 18:00:57 2016 -0700 |
| tree | 6d1c2d77f099680ce4bfcbe15a54a6b0ed77ff5f | |
| parent | f2a4d086ed4c588d32fe9b7aa67fead7280e7bf1 [diff] | |
| parent | f7bd9e36ee4a4ce38e1cddd7effe6c0d9943285b [diff] |
Merge branch 'bpf-fixes' Daniel Borkmann says: ==================== bpf: couple of fixes These are two fixes for BPF, one to introduce xmit recursion limiter for tc bpf programs and the other one to reject filters a bit earlier. For more details please see individual patches. I have no strong opinion to which tree they should go, they apply to both, but I think net-next seems okay to me. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>