| commit | 01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon May 07 23:35:08 2018 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Mon May 07 23:35:08 2018 -0400 |
| tree | 2ae02593d7139962648dff203f3f9701e34ccbc3 | |
| parent | 18b338f5f9539512e76fd9ebd4c6ca1a0e159e2b [diff] | |
| parent | e94fa1d93117e7f1eb783dc9cae6c70650944449 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next Minor conflict, a CHECK was placed into an if() statement in net-next, whilst a newline was added to that CHECK call in 'net'. Thanks to Daniel for the merge resolution. Signed-off-by: David S. Miller <davem@davemloft.net>