From: Jakub Kicinski <kuba@xxxxxxxxxx> Date: Thu, 31 Oct 2024 17:41:07 -0700 > On Wed, 30 Oct 2024 17:51:53 +0100 Alexander Lobakin wrote: >> - struct xdp_mem_info mem; >> + enum xdp_mem_type mem_type:32; > > There is a new use of this field coming in from c40dd8c4732 > Can we wait for that to propagate to net-next ? > I don't have any great ideas on how we can conditionally apply > a fix up in the CI infra.. Good thing it happened already :D Yeah I only need to assign mem_type instead of mem in that new place. linux-next handles conflicts, but not our CI... Thanks, Olek