]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 16 Sep 2021 20:58:38 +0000 (13:58 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 16 Sep 2021 20:58:38 +0000 (13:58 -0700)
commit561bed688bffedd6bbdfa70af7a4f64f0a3e2140
tree19256b7a70dcdb9a95c4a7494a0b8bb9db10ef30
parent4b5a3ab17c6c942bd428984b6b37fe3c07f18ab3
parentfc0c0548c1a2e676d3a928aaed70f2d4d254e395
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts!

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/mellanox/mlx5/core/devlink.c