From: David S. Miller Date: Mon, 2 Jun 2014 05:17:21 +0000 (-0700) Subject: Merge branch 'filter-next' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c532cea97ae4b936cc634fa5e3ca04e57b106235;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- c532cea97ae4b936cc634fa5e3ca04e57b106235