From: Jakub Kicinski <k...@kernel.org> Date: Fri, 2 Oct 2020 08:25:17 -0700
> Dave, are you planning a PR to Linus soon by any chance? The conflict > between this series and Johannes's fix would be logically simple to > resolve but not trivial :( Let me apply Johannes's fix to both net and net-next, and then you can respin a v3 of this series on top of that.