Commit c60ab5c5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 1fc8b74d ("vsock/virtio: Resize receive buffers so that each SKB...


Merge 1fc8b74d ("vsock/virtio: Resize receive buffers so that each SKB fits in a 4K page") into android14-6.1-lts

Steps on the way to 6.1.149

Resolves merge conflicts in:
	include/linux/virtio_vsock.h
	net/vmw_vsock/virtio_transport.c

Change-Id: Ib602983638e5a11455ef3655ef8593a9498d6e59
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9bc09eb3 1fc8b74d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment