Merge 722f6dece7 ("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: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in: