linux-stable/drivers/net/ethernet/netronome/nfp
David S. Miller f8ddadc4db Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
There were quite a few overlapping sets of changes here.

Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.

Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly.  If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.

In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().

Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.

The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-22 13:39:14 +01:00
..
bpf net: sched: avoid ndo_setup_tc calls for TC_SETUP_CLS* 2017-10-21 03:04:08 +01:00
flower nfp: use struct fields for 8 bit-wide access 2017-10-22 03:09:32 +01:00
nfpcore nfp: wait for the NSP resource to appear on boot 2017-09-13 13:29:13 -07:00
nic nfp: separate app vNIC init/clean from alloc/free 2017-09-03 21:22:04 -07:00
Makefile nfp: bpf: move software reg helpers and cmd table out of translator 2017-10-09 09:51:02 -07:00
nfp_app.c nfp: Explicitly include linux/bug.h 2017-10-14 18:31:41 -07:00
nfp_app.h nfp: output control messages to trace_devlink_hwmsg() 2017-10-09 09:51:02 -07:00
nfp_app_nic.c nfp: separate app vNIC init/clean from alloc/free 2017-09-03 21:22:04 -07:00
nfp_asm.c nfp: bpf: direct packet access - write 2017-10-14 11:13:28 -07:00
nfp_asm.h nfp: Explicitly include linux/bug.h 2017-10-14 18:31:41 -07:00
nfp_devlink.c nfp: devlink add support for getting eswitch mode 2017-06-25 11:42:01 -04:00
nfp_hwmon.c nfp: add hwmon support 2017-05-30 11:27:06 -04:00
nfp_main.c nfp: wait for the NSP resource to appear on boot 2017-09-13 13:29:13 -07:00
nfp_main.h nfp: add basic SR-IOV ndo functions 2017-08-25 19:24:58 -07:00
nfp_net.h nfp: allow retreiving management FW logs on representors 2017-08-18 22:39:27 -07:00
nfp_net_common.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-10-22 13:39:14 +01:00
nfp_net_ctrl.h nfp: bpf: move to datapath ABI version 2 2017-10-09 09:51:03 -07:00
nfp_net_debugfs.c nfp: don't reuse pointers in ring dumping 2017-08-18 22:39:28 -07:00
nfp_net_ethtool.c nfp: fix ethtool stats gather retry 2017-10-10 13:18:33 -07:00
nfp_net_main.c nfp: wait for board state before talking to the NSP 2017-09-13 13:29:13 -07:00
nfp_net_repr.c nfp: add basic SR-IOV ndo functions to representors 2017-08-25 19:24:58 -07:00
nfp_net_repr.h nfp: extend flower matching capabilities 2017-07-01 08:51:32 -07:00
nfp_net_sriov.c nfp: add basic SR-IOV ndo functions 2017-08-25 19:24:58 -07:00
nfp_net_sriov.h nfp: add basic SR-IOV ndo functions 2017-08-25 19:24:58 -07:00
nfp_netvf_main.c nfp: advertise support for NFD ABI 0.5 2017-06-07 12:51:42 -04:00
nfp_port.c nfp: store pointer to MAC statistics in nfp_port 2017-08-18 22:39:28 -07:00
nfp_port.h nfp: add ethtool statistics for representors 2017-08-18 22:39:28 -07:00