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)
commitaf7054198f5c58088ddbc889ff171a0329d17d8a
tree4e7003c31ee7623c1119a4fd21fac007766e9259
parent8cf048569c83fc29445a9cb50a4ecf2263d6107e
parentcd3d78aeedc80f15bbc95533cfe8050253676dc6
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>