mirror of
https://github.com/torvalds/linux
synced 2026-06-15 06:42:08 +09: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>