| commit | 14684b93019a2d2ece0df5acaf921924541b928d | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Nov 09 11:04:37 2019 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Sat Nov 09 11:04:37 2019 -0800 |
| tree | 29cf04da2f22b85b6051b47b3731e91a43d4c94d | |
| parent | 92da362c07d413786ab59db1665376fb63805586 [diff] | |
| parent | 0058b0a506e40d9a2c62015fe92eb64a44d78cd9 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 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>