mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A set of overlapping changes in macvlan and the rocker driver, nothing serious. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
b079115937
200 changed files with 1392 additions and 881 deletions
|
|
@ -580,7 +580,7 @@ int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event,
|
|||
int ret = -ENOMEM, max_order = 0;
|
||||
|
||||
if (!has_aux(event))
|
||||
return -ENOTSUPP;
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
if (event->pmu->capabilities & PERF_PMU_CAP_AUX_NO_SG) {
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue