]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'iwl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux
authorDavid S. Miller <davem@davemloft.net>
Wed, 2 Jun 2021 00:07:56 +0000 (17:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Jun 2021 00:07:56 +0000 (17:07 -0700)
commit174b90f1ffe75c6ced426bbe7a10c9c1b018b587
tree42d76b3735ab725c70aeac7f12ac2b5b73d67411
parent0ef8015b2e9179d83cbea9043602af5cf68dd919
parentc12cf665b87de4b9a75f1ea4c13d7a862b88dee6
Merge branch 'iwl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux

Tony Nguyen says:

====================
iwl-next Intel Wired LAN Driver Updates 2021-06-01

This pull request is targeting net-next and rdma-next branches.
These patches have been reviewed by netdev and rdma mailing lists[1].

This series adds RDMA support to the ice driver for E810 devices and
converts the i40e driver to use the auxiliary bus infrastructure
for X722 devices. The PCI netdev drivers register auxiliary RDMA devices
that will bind to auxiliary drivers registered by the new irdma module.

[1] https://lore.kernel.org/netdev/20210520143809.819-1-shiraz.saleem@intel.com/
---
v3:
- ice_aq_add_rdma_qsets(), ice_cfg_vsi_rdma(), ice_[ena|dis]_vsi_rdma_qset(),
and ice_cfg_rdma_fltr() no longer return ice_status
- Remove null check from ice_aq_add_rdma_qsets()

v2:
- Added patch 'i40e: Replace one-element array with flexible-array
member'

Changes since linked review (v6):
- Removed unnecessary checks in i40e_client_device_register() and
i40e_client_device_unregister()
- Simplified the i40e_client_device_register() API
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS