git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9e86094 738d290)

author	David S. Miller <davem@davemloft.net>
	Tue, 31 Dec 2019 21:37:13 +0000 (13:37 -0800)
committer	David S. Miller <davem@davemloft.net>
	Tue, 31 Dec 2019 21:37:13 +0000 (13:37 -0800)
commit	31d518f35e1a80268a24a855be9477eb458540ad
tree	28494f630aede8f95d4ed2ebbfd14c222bd24fa6	tree \| snapshot
parent	9e860947d8d7a1504476ac49abfce90a4ce600f3	commit \| diff
parent	738d2902773e30939a982c8df7a7f94293659810	commit \| diff

Merge git://git./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

MicroBlaze GIT Repository