mirror of
https://github.com/xenia-project/linux.git
synced 2026-01-31 01:35:30 +01:00
The ungrafting from PRIO bug fixes in net, when merged into net-next, merge cleanly but create a build failure. The resolution used here is from Petr Machata. Signed-off-by: David S. Miller <davem@davemloft.net>