path: root/.gitattributes
diff options
authorDavid S. Miller <davem@davemloft.net>2018-03-01 21:42:07 -0500
committerDavid S. Miller <davem@davemloft.net>2018-03-01 21:42:07 -0500
commita5f7b0eeb219620e1f7388db817e2fb584c00b64 (patch)
tree222a711e961168bfe5df800913c198fb167330de /.gitattributes
parenta6d50512b4d86ecd9f5952525e454583be1c3b14 (diff)
parent9960d7669eaa42e82a2f4393adf549191de2e587 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says: ==================== pull-request: bpf 2018-02-28 The following pull-request contains BPF updates for your *net* tree. The main changes are: 1) Add schedule points and reduce the number of loop iterations the test_bpf kernel module is performing in order to not hog the CPU for too long, from Eric. 2) Fix an out of bounds access in tail calls in the ppc64 BPF JIT compiler, from Daniel. 3) Fix a crash on arm64 on unaligned BPF xadd operations that could be triggered via interpreter and JIT, from Daniel. Please not that once you merge net into net-next at some point, there is a minor merge conflict in test_verifier.c since test cases had been added at the end in both trees. Resolution is trivial: keep all the test cases from both trees. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions