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

Merge d2a97097 ("btrfs: fix off-by-one chunk length calculation at...


Merge d2a97097 ("btrfs: fix off-by-one chunk length calculation at contains_pending_extent()") into android-mainline

Steps on the way to 5.10.215

Resolves the merge conflicts in:
	fs/fuse/dir.c

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