Merge tag 'v5.18'
authorKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Tue, 31 May 2022 13:13:23 +0000 (16:13 +0300)
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Tue, 31 May 2022 13:13:23 +0000 (16:13 +0300)
Linux 5.18

1  2 
fs/ntfs3/file.c
fs/ntfs3/inode.c

diff --cc fs/ntfs3/file.c
Simple merge
Simple merge