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

Browse source

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>

...

This commit is contained in:

David S. Miller 2020-01-09 12:10:26 -08:00

parent b1daa4d194 e69ec487b2

commit a2d6d7ae59

232 changed files with 1551 additions and 869 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

include/uapi/linux/kcov.h

View file