Merge branch 'filter-next'
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Jun 2014 05:17:21 +0000 (22:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Jun 2014 05:17:21 +0000 (22:17 -0700)
commitc532cea97ae4b936cc634fa5e3ca04e57b106235
tree3468a865cc28d7c6bf743879a72751c9adfb6e7e
parent019ee792d7861fde33e6c2331a8b32a2b975e865
parentf8f6d679aaa78b989d9aee8d2935066fbdca2a30
Merge branch 'filter-next'

Daniel Borkmann says:

====================
BPF + test suite updates

These are the last bigger BPF changes that I had in my todo
queue for now. As the first two patches from this series
contain additional test cases for the test suite, I have
rebased them on top of current net-next with the set from [1]
applied to avoid introducing any unnecessary merge conflicts.

For details, please refer to the individual patches. Test
suite runs fine with the set applied.

 [1] http://patchwork.ozlabs.org/patch/352599/
     http://patchwork.ozlabs.org/patch/352600/
====================

Signed-off-by: David S. Miller <davem@davemloft.net>