Files
Greg Kroah-Hartman db92d2187f Merge d5ca39d336 ("btrfs: fix two misuses of folio_shift()") into android16-6.12
Steps on the way to 6.12.20

Resolves merge conflicts in:
	fs/btrfs/extent_io.c
	kernel/futex/core.c

Change-Id: If0d75c0d1a638c34dea1a88e09ef07feed5af130
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-04-22 09:30:35 +00:00
..