summaryrefslogtreecommitdiff
path: root/staging/mops.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-06-15 17:00:35 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-06-15 17:00:35 +0200
commit9fdfb453645b3c7058272419d913ae2591a8fdf3 (patch)
tree0df9388e261f62d91f4a5ba36611b03449e567e2 /staging/mops.c
parentf5c440184fb7c02d420e3c4274e63474c74bbeff (diff)
bpfc: stress that also seccomp-BPF can be generated with bpfc
Just add a minor sentence to help stating this. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'staging/mops.c')
0 files changed, 0 insertions, 0 deletions
>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/ethtool.c')