From: David S. Miller Date: Mon, 26 Jan 2015 23:50:24 +0000 (-0800) Subject: Merge branch 'cls_bpf' X-Git-Tag: v3.19-rc7~23^2~16 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=b6663ad702d63f44ec7af01f34fbfb34abdd13a6;hp=-c;p=cascardo%2Flinux.git Merge branch 'cls_bpf' Daniel Borkmann says: ==================== Two cls_bpf fixes Found them while doing a review on act_bpf and going over the cls_bpf code again. Will also address the first issue in act_bpf as it needs to be fixed there, too. ==================== Signed-off-by: David S. Miller --- b6663ad702d63f44ec7af01f34fbfb34abdd13a6