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

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 090597b 9f42f67)

author	David S. Miller <davem@davemloft.net>
	Fri, 23 Jul 2021 14:59:46 +0000 (15:59 +0100)
committer	David S. Miller <davem@davemloft.net>
	Fri, 23 Jul 2021 15:13:06 +0000 (16:13 +0100)
commit	5af84df962dd6699e3972fda7a0c8b579fb3ab04
tree	0a66f54c99c0c0d22588304d030ecb752487dfa1	tree \| snapshot
parent	090597b4a9c1b81b03fd7cfb4ba458a0e7a78b31	commit \| diff
parent	9f42f674a89200d4f465a7db6070e079f3c6145f	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Conflicts are simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

17 files changed:

Documentation/networking/ip-sysctl.rst	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/sja1105/sja1105_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/conntrack.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/bpf/test_run.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_fastopen.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp_bpf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository