summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-10-03 14:02:50 +0200
committerDavid S. Miller <davem@davemloft.net>2015-10-03 14:02:50 +0200
commitf8e1100afc4f362e94c2d4a3231f16c77beb6d1b (patch)
tree4e7003c31ee7623c1119a4fd21fac007766e9259 /init
parentMerge branch 'switchdev-obj' (diff)
parentsched, bpf: make skb->priority writable (diff)
downloadlinux-f8e1100afc4f362e94c2d4a3231f16c77beb6d1b.tar.xz
linux-f8e1100afc4f362e94c2d4a3231f16c77beb6d1b.zip
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>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions