diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-21 22:39:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-21 22:39:34 +0100 |
| commit | e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06 (patch) | |
| tree | 04b1728c397ad4604a6163529f51dfd48dfdbc07 /drivers/net/ethernet/intel/ice/ice_dcb_lib.c | |
| parent | Merge branch 'Migrate-QRTR-Nameservice-to-Kernel' (diff) | |
| parent | Merge tag 'linux-watchdog-5.6-rc3' of git://www.linux-watchdog.org/linux-watc... (diff) | |
| download | linux-e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06.tar.xz linux-e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflict resolution of ice_virtchnl_pf.c based upon work by
Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_dcb_lib.c')
0 files changed, 0 insertions, 0 deletions