On Tue, Apr 09, 2024 at 02:44:19PM -0700, Jakub Kicinski wrote: > On Tue, 9 Apr 2024 18:01:40 +0100 Edward Cree wrote: > > > Shared branch would be good. Ed has some outstanding patches > > > to refactor the ethtool RSS API. > > > > For the record I am extremely unlikely to have time to get those > > done this cycle :( > > Though in any case fwiw it doesn't look like this series touches > > anything that would conflict; mana doesn't appear to support > > custom RSS contexts and besides the changes are well away from > > the ethtool API handling. > > Better safe than sorry, since the change applies cleanly on an -rc tag > having it applied to both trees should be very little extra work. I prepared mana-ib-flex branch https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/log/?h=mana-ib-flex and merge ti to our wip branch https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/commit/?h=wip/leon-for-next&id=e537deecda03e0911e9406095ccd48bd42f328c7 Thanks
