On Fri, Apr 30, 2021 at 01:55:27PM -0300, Jason Gunthorpe wrote: > Hi Linus, > > These are the proposed RDMA patches for 5.13. > > We are continuing to see small cycles in RDMA, this may be a new > structural normal. > > This time hns and rtrs lead the pack in change volume, but must is > cleaning not features. Oh! I forget to include the minor conflict resolution for hfi against v5.12: @@@ -1402,7 -1408,8 +1402,8 @@@ struct hfi1_devdata /* Lock to protect IRQ SRC register access */ spinlock_t irq_src_lock; int vnic_num_vports; - struct net_device *dummy_netdev; + struct hfi1_netdev_rx *netdev_rx; + struct hfi1_affinity_node *affinity_entry; /* Keeps track of IPoIB RSM rule users */ atomic_t ipoib_rsm_usr_num; Sorry, Jason