From: David S. Miller Date: Tue, 2 Apr 2019 20:27:11 +0000 (-0700) Subject: Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Tag: v5.1-rc4~19^2~13 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=845368bc61a7cb76ddc35ab397dd918a31efacb5;p=users%2Fwilly%2Fxarray.git Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue Jeff Kirsher says: ==================== Intel Wired LAN Driver Fixes 2019-04-01 This series contains two fixes for XDP in the i40e driver. Björn provides both fixes, first moving a function out of the header and into the main.c file. Second fixes a regression introduced in an earlier patch that removed umem from the VSI. This caused an issue because the setup code would try to enable AF_XDP zero copy unconditionally, as long as there was a umem placed in the netdev receive structure. ==================== Signed-off-by: David S. Miller --- 845368bc61a7cb76ddc35ab397dd918a31efacb5