xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse Source 
Merge conflict of mlx5 resolved using instructions in merge
commit 9566e650bf.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2019-08-19 11:54:03 -07:00
parent 20e79a0a2c 06821504fd
commit 446bf64b61
549 changed files with 4710 additions and 2902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/cavium/common/cavium_ptp.c
View File

@@ -10,7 +10,7 @@
#include "cavium_ptp.h"
#define DRV_NAME "Cavium PTP Driver"
#define DRV_NAME "cavium_ptp"
#define PCI_DEVICE_ID_CAVIUM_PTP 0xA00C
#define PCI_DEVICE_ID_CAVIUM_RST 0xA00E

4
drivers/net/ethernet/cavium/liquidio/request_manager.c
View File

@@ -237,8 +237,10 @@ int octeon_setup_iq(struct octeon_device *oct,
}
oct->num_iqs++;
if (oct->fn_list.enable_io_queues(oct))
if (oct->fn_list.enable_io_queues(oct)) {
octeon_delete_instr_queue(oct, iq_no);
return 1;
}
return 0;
}