mirror_ubuntu-kernels/drivers/net/ethernet/broadcom/bnxt
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
..
bnxt_dcb.c bnxt_en: Fix possible corruption in DCB parameters from firmware. 2017-10-14 18:51:51 -07:00
bnxt_dcb.h bnxt_en: Set ETS min_bw parameter for older firmware. 2017-07-24 17:29:58 -07:00
bnxt_devlink.c bnxt: Move generic devlink code to new file 2017-10-21 12:28:39 +01:00
bnxt_devlink.h bnxt: Move generic devlink code to new file 2017-10-21 12:28:39 +01:00
bnxt_ethtool.c bnxt_en: Fix possible corrupted NVRAM parameters from firmware response. 2017-10-14 18:51:51 -07:00
bnxt_ethtool.h bnxt_en: Add basic ethtool -t selftest support. 2017-04-05 06:24:26 -07:00
bnxt_fw_hdr.h bnxt_en: Added support for Secure Firmware Update 2016-09-19 21:32:24 -04:00
bnxt_hsi.h bnxt_en: Update firmware interface spec. to 1.8.1.4. 2017-08-28 16:57:09 -07:00
bnxt_nvm_defs.h bnxt_en: Add support for updating flash more securely 2016-07-02 14:52:35 -04:00
bnxt_sriov.c bnxt_en: Fix VF resource checking. 2017-10-14 18:51:51 -07:00
bnxt_sriov.h bnxt_en: Update firmware interface spec to 1.7.6.2. 2017-04-05 06:24:26 -07:00
bnxt_tc.c bnxt: Convert ndo_setup_tc offloads to block callbacks 2017-10-21 03:04:07 +01:00
bnxt_tc.h bnxt_en: bnxt: add TC flower filter offload support 2017-08-28 16:57:10 -07:00
bnxt_ulp.c bnxt_en: Free MSIX vectors when unregistering the device from bnxt_re. 2017-08-23 22:42:42 -07:00
bnxt_ulp.h bnxt_en: Add a callback to inform RDMA driver during PCI shutdown. 2017-05-30 18:14:07 -04:00
bnxt_vfr.c bnxt: Move generic devlink code to new file 2017-10-21 12:28:39 +01:00
bnxt_vfr.h bnxt: Move generic devlink code to new file 2017-10-21 12:28:39 +01:00
bnxt_xdp.c bpf: add meta pointer for direct access 2017-09-26 13:36:44 -07:00
bnxt_xdp.h bnxt_en: Add ethtool mac loopback self test. 2017-04-05 06:24:26 -07:00
bnxt.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-10-22 13:39:14 +01:00
bnxt.h bnxt_en: Fix possible corrupted NVRAM parameters from firmware response. 2017-10-14 18:51:51 -07:00
Makefile bnxt: Move generic devlink code to new file 2017-10-21 12:28:39 +01:00