tree 32938bec99cbb4589617a34f8a193fbfeb69bb4a
parent c77aeec72a52fff2661e8ab5721e84be07b82a58
parent 9ff9b0d392ea08090cd1780fb196f36dbb586529
author Greg Kroah-Hartman <gregkh@google.com> 1603696776 +0100
committer Greg Kroah-Hartman <gregkh@google.com> 1603700421 +0100

Merge 9ff9b0d392ea ("Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline

Steps on the way to 5.10-rc1

Resolves merge issues in:
	drivers/net/virtio_net.c
	net/xfrm/xfrm_state.c
	net/xfrm/xfrm_user.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3132e7802f25cb775eb02d0b3a03068da39a6fe2