From: David S. Miller Date: Fri, 23 May 2014 20:48:50 +0000 (-0400) Subject: Merge branch 'filter-next' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=be65de7174123e02477bd488db1a657caf0f9947;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'filter-next' Daniel Borkmann says: ==================== BPF updates These were still in my queue. Please see individual patches for details. I have rebased these on top of current net-next with Andrew's gcc union fixup [1] applied to avoid dealing with an unnecessary merge conflict. [1] http://patchwork.ozlabs.org/patch/351577/ ==================== Signed-off-by: David S. Miller --- be65de7174123e02477bd488db1a657caf0f9947