Merge branch 's390-bpf-push-pop'
authorDavid S. Miller <davem@davemloft.net>
Wed, 29 Jul 2015 21:59:59 +0000 (14:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Jul 2015 21:59:59 +0000 (14:59 -0700)
commitb88d0a049084854aef0ea146f1411eafcd2597a8
treee4d0b2ed3dc2e6900106edff81e834f063007e1c
parent35e455f47ac2e7fbc0c25871a4e91c563ff78ce1
parent9db7f2b818809ef2c40fbd64cfcf5ccb0107d7e8
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>