]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 921ce9b 74e8ab0)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 31 Dec 2019 21:37:13 +0000 (13:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Dec 2019 21:37:13 +0000 (13:37 -0800)
commitb77b006c45770c76e5eae9723424dd3229e29bfc
tree28494f630aede8f95d4ed2ebbfd14c222bd24fa6tree | snapshot
parent921ce9b1a325b4945ab53ee753a83665e0413764commit | diff
parent74e8ab0fa64c452b21b414a3bbfd1d954b82a727commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Simple overlapping changes in bpf land wrt. bpf_helper_defs.h
handling.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/sja1105/sja1105_ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/reg.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c diff1 | diff2 | blob | history
drivers/ptp/ptp_clock.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_core_main.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_l2_main.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_l3_main.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_l3_sys.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/sctp/stream.c diff1 | diff2 | blob | history
net/sctp/transport.c diff1 | diff2 | blob | history
tools/lib/bpf/Makefile diff1 | diff2 | blob | history
tools/testing/selftests/bpf/.gitignore diff1 | diff2 | blob | history
tools/testing/selftests/bpf/Makefile diff1 | diff2 | blob | history
Linux Kernel Source Tree.