diff options
| author | David S. Miller | 2018-05-08 05:35:08 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-05-08 05:35:08 +0200 |
| commit | 01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4 (patch) | |
| tree | 2ae02593d7139962648dff203f3f9701e34ccbc3 /net/8021q | |
| parent | liquidio: support use of ethtool to set link speed of CN23XX-225 cards (diff) | |
| parent | bpf, xskmap: fix crash in xsk_map_alloc error path handling (diff) | |
| download | kernel-qcow2-linux-01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4.tar.gz kernel-qcow2-linux-01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4.tar.xz kernel-qcow2-linux-01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4.zip | |
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>
Diffstat (limited to 'net/8021q')
0 files changed, 0 insertions, 0 deletions