| commit | a2d6d7ae591c47ebc04926cb29a840adfdde49e6 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jan 09 12:10:26 2020 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jan 09 12:13:43 2020 -0800 |
| tree | be464f987f0ab690481e2783d680aa88574026e4 | |
| parent | b1daa4d194731ab484fb22742506dd25ad1a5628 [diff] | |
| parent | e69ec487b2c7c82ef99b4b15122f58a2a99289a3 [diff] |
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>