leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2e2d6f0342
linux/drivers/net/ethernet/netronome/nfp
History
David S. Miller 2e2d6f0342 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.

net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'.  Thanks to David
Ahern for the heads up.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-10-19 11:03:06 -07:00
..
abm nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
bpf nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
flower Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-10-19 11:03:06 -07:00
nfpcore nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nic nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
Makefile nfp: flower: monitor and offload LAG groups 2018-05-24 23:10:57 -04:00
nfp_abi.h nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_app_nic.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_app.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_app.h nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_asm.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_asm.h nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_devlink.c nfp: devlink port split support for 1x100G CXP NIC 2018-10-15 22:29:55 -07:00
nfp_hwmon.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_main.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_main.h nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_common.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_ctrl.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_ctrl.h nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_debugdump.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_debugfs.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_ethtool.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_main.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_repr.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_repr.h nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_sriov.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net_sriov.h nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_net.h nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_netvf_main.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_port.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_port.h nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_shared_buf.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00