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
..
cn23xx_pf_device.c	liquidio: fix crash in presence of zeroed-out base address regs	2017-08-30 22:07:09 -07:00
cn23xx_pf_device.h	liquidio: move macro definition to a proper place	2017-08-22 11:08:15 -07:00
cn23xx_pf_regs.h	liquidio CN23XX: fix for new check patch errors	2016-11-15 22:24:40 -05:00
cn23xx_vf_device.c	liquidio: replace info-pointer mode with buffer-pointer-only mode	2017-06-18 23:55:46 -04:00
cn23xx_vf_device.h	liquidio: moved wait_for_pending_requests to octeon_network.h	2017-08-14 22:21:39 -07:00
cn23xx_vf_regs.h	liquidio CN23XX: VF register definitions	2016-11-30 11:03:08 -05:00
cn66xx_device.c	liquidio: fix bug in soft reset failure detection	2017-07-06 10:36:03 +01:00
cn66xx_device.h	liquidio CN23XX: copyrights changes and alignment	2016-11-15 22:24:40 -05:00
cn66xx_regs.h	liquidio CN23XX: fix for new check patch errors	2016-11-15 22:24:40 -05:00
cn68xx_device.c	liquidio CN23XX: fix for new check patch errors	2016-11-15 22:24:40 -05:00
cn68xx_device.h	liquidio CN23XX: copyrights changes and alignment	2016-11-15 22:24:40 -05:00
cn68xx_regs.h	liquidio CN23XX: copyrights changes and alignment	2016-11-15 22:24:40 -05:00
lio_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-09-06 14:45:08 -07:00
lio_ethtool.c	liquidio: fix spelling mistake: "interuupt" -> "interrupt"	2017-08-17 10:05:24 -07:00
lio_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
lio_vf_main.c	liquidio: mark expected switch fall-through in octeon_destroy_resources	2017-10-19 13:27:55 +01:00
liquidio_common.h	liquidio: change manner of detecting whether or not NIC firmware is loaded	2017-08-23 20:29:24 -07:00
liquidio_image.h	liquidio: allow override of firmware present in flash	2017-09-25 20:25:39 -07:00
Makefile	liquidio CN23XX: VF config setup	2016-11-30 11:03:08 -05:00
octeon_config.h	liquidio: added support for ethtool --set-ring feature	2017-08-14 22:21:40 -07:00
octeon_console.c	liquidio: show NIC's U-Boot version in a dev_info() message	2017-08-29 16:08:09 -07:00
octeon_device.c	liquidio: allow override of firmware present in flash	2017-09-25 20:25:39 -07:00
octeon_device.h	liquidio: allow override of firmware present in flash	2017-09-25 20:25:39 -07:00
octeon_droq.c	liquidio: rx/tx queue cleanup	2017-08-11 13:54:41 -07:00
octeon_droq.h	smp: Avoid using two cache lines for struct call_single_data	2017-08-29 15:14:38 +02:00
octeon_iq.h	liquidio: fix inaccurate count of napi-processed rx packets reported to Octeon	2017-05-26 14:41:48 -04:00
octeon_mailbox.c	liquidio: fix rare pci_driver.probe failure of VF driver	2017-05-26 14:41:47 -04:00
octeon_mailbox.h	liquidio: fix rare pci_driver.probe failure of VF driver	2017-05-26 14:41:47 -04:00
octeon_main.h	liquidio: moved liquidio_msix_intr_handler to lio_core.c	2017-08-15 21:05:31 -07:00
octeon_mem_ops.c	liquidio: stop using huge static buffer, save 4096k in .data	2017-06-22 11:03:00 -04:00
octeon_mem_ops.h	liquidio: stop using huge static buffer, save 4096k in .data	2017-06-22 11:03:00 -04:00
octeon_network.h	liquidio: added support for ethtool --set-channels feature	2017-08-15 21:05:31 -07:00
octeon_nic.c	liquidio: fix VF incorrectly indicating that it successfully set its VLAN	2017-04-08 08:38:41 -07:00
octeon_nic.h	liquidio: fix VF incorrectly indicating that it successfully set its VLAN	2017-04-08 08:38:41 -07:00
request_manager.c	liquidio: removed check for queue size alignment	2017-08-11 13:55:57 -07:00
response_manager.c	liquidio: fix for vf mac addr command sent to nic firmware	2017-03-21 17:48:29 -07:00
response_manager.h	liquidio: fix for vf mac addr command sent to nic firmware	2017-03-21 17:48:29 -07:00