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

Merge 02a77b30 ("loop: Use bdev limit helpers for configuring discard") into android16-6.12-lts 



Steps on the way to 6.12.29

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

Change-Id: I3e25de703dacfbf0ad58377ca9efe3a36867f726
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6a0454f0 02a77b30
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