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

Merge 33726917 ("btrfs: send: use fallocate for hole punching with send...


Merge 33726917 ("btrfs: send: use fallocate for hole punching with send stream v2") into android14-6.1-lts

Steps on the way to 6.1.149

Resolves merge conflicts in:
	drivers/net/veth.c
	drivers/vhost/vsock.c
	fs/crypto/fscrypt_private.h
	net/vmw_vsock/virtio_transport.c

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