| commit | 7b9f6da175f9387ebfc202f35e0d39514899ab19 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Apr 20 10:35:33 2017 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu Apr 20 10:35:33 2017 -0400 |
| tree | a884c05aaeff40d8f80831549cccc820dcdd0f4f | |
| parent | 9868879f293c599ce13b584c5bd8800312970781 [diff] | |
| parent | 1debdc8f9ebd07daf140e417b3841596911e0066 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net A function in kernel/bpf/syscall.c which got a bug fix in 'net' was moved to kernel/bpf/verifier.c in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>