UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/net/ethernet/mellanox/mlx5/core
History
David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2016-09-12 15:52:44 -07:00
..
Kconfig net/mlx5: Add devlink interface 2016-07-02 14:40:40 -04:00
Makefile net/mlx5: Organize device list API in one place 2016-09-10 21:21:50 -07:00
alloc.c net/mlx5e: Allocate DMA coherent memory on reader NUMA node 2015-07-27 00:29:17 -07:00
cmd.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
cq.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
debugfs.c {net,IB}/mlx5: QP/XRCD commands via mlx5 ifc 2016-08-17 17:45:57 +03:00
dev.c net/mlx5: Organize device list API in one place 2016-09-10 21:21:50 -07:00
en.h net/mlx5e: Implement mlx5e interface attach/detach callbacks 2016-09-10 21:21:50 -07:00
en_arfs.c net/mlx5: Refactor mlx5_add_flow_rule 2016-07-05 00:06:02 -07:00
en_clock.c net/mlx5e: CQE compression 2016-05-11 19:42:39 -04:00
en_common.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
en_dcbnl.c net/mlx5: Add error prints when validate ETS failed 2016-08-28 23:24:16 -04:00
en_ethtool.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
en_fs.c net/mlx5e: Restore vlan filter after seamless reset 2016-09-10 21:21:50 -07:00
en_fs_ethtool.c net/mlx5e: Add support to get ethtool flow rules 2016-07-05 00:06:03 -07:00
en_main.c net/mlx5e: Implement mlx5e interface attach/detach callbacks 2016-09-10 21:21:50 -07:00
en_rep.c net/mlx5e: Implement mlx5e interface attach/detach callbacks 2016-09-10 21:21:50 -07:00
en_rx.c net/mlx5e: Fix parsing of vlan packets when updating lro header 2016-09-08 16:15:29 -07:00
en_rx_am.c net/mlx5e: Support adaptive RX coalescing 2016-06-27 04:10:41 -04:00
en_stats.h net/mlx5e: Add ethtool counter for TX xmit_more 2016-08-28 23:24:15 -04:00
en_tc.c net/mlx5e: Use correct flow dissector key on flower offloading 2016-08-19 16:09:56 -07:00
en_tc.h net/mlx5e: Hardware offloaded flower filter statistics support 2016-05-16 13:43:51 -04:00
en_tx.c net/mlx5e: Fix xmit_more counter race issue 2016-09-08 16:15:28 -07:00
en_txrx.c net/mlx5e: Don't wait for SQ completions on close 2016-08-28 23:24:15 -04:00
eq.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
eswitch.c net/mlx5: Implement vports admin state backup/restore 2016-09-10 21:21:50 -07:00
eswitch.h net/mlx5: Implement vports admin state backup/restore 2016-09-10 21:21:50 -07:00
eswitch_offloads.c net/mlx5: E-Switch, Set the send-to-vport rules in the correct table 2016-08-19 16:09:56 -07:00
fs_cmd.c net/mlx5: LAG demux flow table support 2016-08-18 18:49:56 +03:00
fs_cmd.h net/mlx5: LAG demux flow table support 2016-08-18 18:49:56 +03:00
fs_core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
fs_core.h net/mlx5: Add sniffer namespaces 2016-08-18 18:49:59 +03:00
fs_counters.c net/mlx5: Update last-use statistics for flow rules 2016-08-19 16:09:55 -07:00
fw.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
health.c net/mlx5_core/health: Remove deprecated create_singlethread_workqueue 2016-07-26 15:18:56 -07:00
lag.c net/mlx5: Organize device list API in one place 2016-09-10 21:21:50 -07:00
mad.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
main.c net/mlx5: Organize device list API in one place 2016-09-10 21:21:50 -07:00
mcg.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
mlx5_core.h net/mlx5: Organize device list API in one place 2016-09-10 21:21:50 -07:00
mr.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
pagealloc.c net/mlx5: Skip waiting for vf pages in internal error 2016-09-10 21:21:48 -07:00
pd.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
port.c net/mlx5: Separate query_port_proto_oper for IB and EN 2016-08-18 18:49:52 +03:00
qp.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
rl.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
sriov.c net/mlx5: Align sriov/eswitch modules with the new load/unload flow. 2016-09-10 21:21:50 -07:00
srq.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
transobj.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
uar.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
vport.c net/mlx5: Enable setting minimum inline header mode for VFs 2016-08-17 17:45:59 +03:00
vxlan.c net/mlx5: Unify and improve command interface 2016-08-17 17:45:58 +03:00
vxlan.h mlx5: Fix merge errors. 2016-05-09 22:05:13 -04:00
wq.c net/mlx5: use mlx5_buf_alloc_node instead of mlx5_buf_alloc in mlx5_wq_ll_create 2016-06-28 05:17:38 -04:00
wq.h net/mlx5e: Allocate DMA coherent memory on reader NUMA node 2015-07-27 00:29:17 -07:00