-
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netDavid S. Miller authored
One conflict in the BPF samples Makefile, some fixes in 'net' whilst we were converting over to Makefile.target rules in 'net-next'. Signed-off-by:
David S. Miller <davem@davemloft.net>
14684b93git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netDavid S. Miller authoredOne conflict in the BPF samples Makefile, some fixes in 'net' whilst we were converting over to Makefile.target rules in 'net-next'. Signed-off-by:
David S. Miller <davem@davemloft.net>
Loading