Merge branch 'bpf-updates'
authorDavid S. Miller <davem@davemloft.net>
Sat, 3 Oct 2015 12:02:50 +0000 (05:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 3 Oct 2015 12:02:50 +0000 (05:02 -0700)
commitf8e1100afc4f362e94c2d4a3231f16c77beb6d1b
tree4e7003c31ee7623c1119a4fd21fac007766e9259
parentbd8762bec95ed81d5b81390ff23c5f83345cb536
parent754f1e6a36c9b42525de223ee1ba628dcafbad41
Merge branch 'bpf-updates'

Daniel Borkmann says:

====================
BPF updates

Some minor updates to {cls,act}_bpf to retrieve routing realms
and to make skb->priority writable.

Thanks!

v1 -> v2:
 - Dropped preclassify patch for now from the series as the
   rest is pretty much independent of it
 - Rest unchanged, only rebased and already posted Acked-by's kept
====================

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