From: David S. Miller <davem@davemloft.net>
Date: Tue, 31 Jul 2018 16:48:22 +0000 (-0700)
Subject: Merge branch 'xsk-improvements-to-RX-queue-check-and-replace'
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~4765^2~186
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6293e4d674d0f6cb01cd19307dd477988776c521;p=mirror_ubuntu-focal-kernel.git

Merge branch 'xsk-improvements-to-RX-queue-check-and-replace'

Jakub Kicinski says:

====================
xsk: improvements to RX queue check and replace

First 3 patches of my recent RFC.  The first one make the check against
real_num_rx_queues slightly more reliable, while the latter two redefine
XDP_QUERY_XSK_UMEM slightly to disallow replacing UMEM in the driver at
the stack level.

I'm not sure where this lays on the bpf vs net trees scale, but there
should be no conflicts with either tree.
====================

Acked-by: Björn Töpel <bjorn.topel@intel.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

6293e4d674d0f6cb01cd19307dd477988776c521