tree be464f987f0ab690481e2783d680aa88574026e4
parent b1daa4d194731ab484fb22742506dd25ad1a5628
parent e69ec487b2c7c82ef99b4b15122f58a2a99289a3
author David S. Miller <davem@davemloft.net> 1578600626 -0800
committer David S. Miller <davem@davemloft.net> 1578600823 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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>