]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c92c81d 38355a5)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 25 Dec 2018 00:19:56 +0000 (16:19 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Dec 2018 00:19:56 +0000 (16:19 -0800)
Pull in bug fixes before respinning my net-next pull
request.

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
net/core/net_namespace.c patch | diff1 | diff2 | blob | history
net/ipv4/ip_tunnel_core.c patch | diff1 | diff2 | blob | history

diff --cc net/core/net_namespace.c
Simple merge
diff --cc net/ipv4/ip_tunnel_core.c
Simple merge
XArray, radix tree and IDR