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

Merge 722f6dec ("loop: Simplify discard granularity calc") into android16-6.12-lts 



Steps on the way to 6.12.29

Resolves merge conflicts in:
	drivers/block/loop.c

Change-Id: I20404f721fc348e35008e4282ec5449432c150f8
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents f3c66066 722f6dec
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment