From: David S. Miller <davem@davemloft.net>
Date: Wed, 29 Jul 2015 21:59:59 +0000 (-0700)
Subject: Merge branch 's390-bpf-push-pop'
X-Git-Tag: firefly_0821_release~176^2~1159^2~277
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b88d0a049084854aef0ea146f1411eafcd2597a8;p=firefly-linux-kernel-4.4.55.git

Merge branch 's390-bpf-push-pop'

Michael Holzheu says:

====================
s390/bpf: recache skb->data/hlen for skb_vlan_push/pop

Here the s390 backend for Alexei's patch 4e10df9a60d9 ("bpf: introduce
bpf_skb_vlan_push/pop() helpers") plus two bugfixes and two minor
improvements.

The first patch "s390/bpf: clear correct BPF accumulator register" will
also go upstream via Martin's "fixes" branch.

* v2: Integrated suggestions from Joe Perches
====================

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

b88d0a049084854aef0ea146f1411eafcd2597a8