OSDN Git Service

Merge branch 'bpf-helper-improvements'
authorDavid S. Miller <davem@davemloft.net>
Thu, 30 Jun 2016 09:54:48 +0000 (05:54 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Jun 2016 09:54:48 +0000 (05:54 -0400)
commit545c321ba3c524045ebc26f6c81b3ec3ba966836
treed02f10ddd1ad1f4e5d280ab8e285f7ab450312fc
parentee58b57100ca953da7320c285315a95db2f7053d
parentd2485c4242a826fdf493fd3a27b8b792965b9b9e
Merge branch 'bpf-helper-improvements'

Daniel Borkmann says:

====================
BPF helper improvements

This set adds various BPF helper improvements, that is, cleaning
up and adding BPF_F_CURRENT_CPU flag for tracing helper, allowing
for preemption checks on bpf_get_smp_processor_id() helper, and
adding two new helpers bpf_skb_change_{proto, type} for tc related
programs. For further details please see individual patches.

Note, this set requires -net to be merged into -net-next tree first.
====================

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