]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c56d69 047e9ae)
Merge branch 'main' into next
authorDavid Ahern <dsahern@kernel.org>
Thu, 4 Nov 2021 15:45:31 +0000 (09:45 -0600)
committerDavid Ahern <dsahern@kernel.org>
Thu, 4 Nov 2021 15:45:31 +0000 (09:45 -0600)
Signed-off-by: David Ahern <dsahern@kernel.org>
1  2 
devlink/devlink.c patch | diff1 | diff2 | blob | history
lib/bpf_legacy.c patch | diff1 | diff2 | blob | history

diff --cc devlink/devlink.c
Simple merge
diff --cc lib/bpf_legacy.c
Simple merge
Mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git