diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-01 17:07:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-01 17:07:56 -0700 |
| commit | e0ae757c32353f7d185779f104e7309af81491e1 (patch) | |
| tree | 42d76b3735ab725c70aeac7f12ac2b5b73d67411 /MAINTAINERS | |
| parent | e65c27938d8e3dd67d55049a82f27e56ca31e728 (diff) | |
| parent | f4370a85d62e645107afc8a35a979be962b19258 (diff) | |
| download | linux-e0ae757c32353f7d185779f104e7309af81491e1.tar.gz linux-e0ae757c32353f7d185779f104e7309af81491e1.tar.bz2 linux-e0ae757c32353f7d185779f104e7309af81491e1.zip | |
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>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9ffec4a8c6ea..9cbc3766fd74 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9137,6 +9137,7 @@ F: Documentation/networking/device_drivers/ethernet/intel/ F: drivers/net/ethernet/intel/ F: drivers/net/ethernet/intel/*/ F: include/linux/avf/virtchnl.h +F: include/linux/net/intel/iidc.h INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) M: Maik Broemme <mbroemme@libmpq.org> |