linux_dsm_epyc7002/drivers/net/ethernet/netronome/nfp
David S. Miller 68aaf44595 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-27 14:23:31 -07:00
..
abm drivers: net: use flow block API 2019-07-09 14:38:50 -07:00
bpf drivers: net: use flow block API 2019-07-09 14:38:50 -07:00
crypto nfp: tls: don't leave key material in freed FW cmsg skbs 2019-07-08 20:21:09 -07:00
flower Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2019-08-27 14:23:31 -07:00
nfpcore nfp: update the old flash error message 2019-06-14 19:18:27 -07:00
nic nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
ccm_mbox.c nfp: ccm: increase message limits 2019-07-08 20:21:09 -07:00
ccm.c nfp: add support for sending control messages via mailbox 2019-06-06 14:13:39 -07:00
ccm.h nfp: tls: ignore queue limits for delete commands 2019-07-08 20:21:09 -07:00
Makefile nfp: add tls init code 2019-06-06 14:13:40 -07: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: add offloads on representors 2018-11-30 13:30:44 -08:00
nfp_app.h nfp: allow fallback packets from non-reprs 2019-04-15 15:45:36 -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 net: devlink: Add extack to shared buffer operations 2019-04-22 22:09:32 -07:00
nfp_hwmon.c nfp: replace long license headers with SPDX 2018-10-11 12:16:21 -07:00
nfp_main.c nfp: add AMDA0058 boards to firmware list 2019-08-26 17:13:35 -07:00
nfp_main.h nfp: devlink: allow flashing the device via devlink 2019-02-17 15:27:38 -08:00
nfp_net_common.c net: Use skb accessors in network drivers 2019-07-22 20:47:56 -07:00
nfp_net_ctrl.c nfp: parse crypto opcode TLV 2019-06-06 14:13:39 -07:00
nfp_net_ctrl.h nfp: prepare for more TX metadata prepend 2019-06-06 14:13:40 -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: no need to check return value of debugfs_create functions 2019-08-10 15:25:48 -07:00
nfp_net_ethtool.c nfp: tls: rename tls packet counters 2019-07-25 13:31:00 -07:00
nfp_net_main.c nfp: register devlink port before netdev 2019-03-28 12:55:30 -07:00
nfp_net_repr.c nfp: reintroduce ndo_get_port_parent_id for representor ports 2019-05-08 16:32:36 -07:00
nfp_net_repr.h nfp: add offloads on representors 2018-11-30 13:30:44 -08:00
nfp_net_sriov.c nfp: add SR-IOV trusted VF support 2019-04-19 21:00:31 -07:00
nfp_net_sriov.h nfp: add SR-IOV trusted VF support 2019-04-19 21:00:31 -07:00
nfp_net.h nfp: tls: use unique connection ids instead of 4-tuple for TX 2019-07-08 20:21:09 -07:00
nfp_netvf_main.c nfp: implement PCI driver shutdown callback 2019-04-26 12:08:13 -04:00
nfp_port.c nfp: reintroduce ndo_get_port_parent_id for representor ports 2019-05-08 16:32:36 -07:00
nfp_port.h nfp: move devlink port type set after netdev registration 2019-03-24 14:55:31 -04:00
nfp_shared_buf.c net: devlink: report cell size of shared buffers 2019-02-03 11:25:34 -08:00