mirror of
https://github.com/torvalds/linux.git
synced 2026-05-14 13:43:20 -04:00
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>