Merge 4911610c7a ("ext4: fix warning in ext4_dio_write_end_io()") into android12-5.10-lts

Browse Source

Steps on the way to 5.10.227

Resolves merge conflicts in:
	fs/ext4/file.c

We merge around this change as it is fixing up something that we have
already reverted in this branch.

Change-Id: I2ba36e89e69fb04fc0368b458b106e6498db53f4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman 2024-11-17 12:06:02 +00:00

parent b585ecc2c9 4911610c7a

commit 7ad1ad5a55

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available