David S. Miller 01adc4851a 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>

2018-05-07 23:35:08 -04:00

..

nfp

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2018-05-07 23:35:08 -04:00

Kconfig

nfp: build the flower offload by default

2017-09-03 21:22:05 -07:00

Makefile

nfp: rename the driver and add new main file

2017-02-10 15:52:24 -05:00