Merge tag 'v5.18'

author Konstantin Komarov <[email protected]>

Tue, 31 May 2022 13:13:23 +0000 (16:13 +0300)

committer Konstantin Komarov <[email protected]>

Tue, 31 May 2022 13:13:23 +0000 (16:13 +0300)
author Konstantin Komarov <[email protected]>
Tue, 31 May 2022 13:13:23 +0000 (16:13 +0300)
committer Konstantin Komarov <[email protected]>
Tue, 31 May 2022 13:13:23 +0000 (16:13 +0300)
diff --cc fs/ntfs3/file.c
Simple merge
diff --cc fs/ntfs3/inode.c
Simple merge
author	Konstantin Komarov <[email protected]>
	Tue, 31 May 2022 13:13:23 +0000 (16:13 +0300)
committer	Konstantin Komarov <[email protected]>
	Tue, 31 May 2022 13:13:23 +0000 (16:13 +0300)
		1	2
fs/ntfs3/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ntfs3/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history