diff options
| author | Linus Torvalds <[email protected]> | 2025-09-14 00:16:52 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2025-09-14 00:16:52 +0000 |
| commit | f83a4f2a4d8c485922fba3018a64fc8f4cfd315f (patch) | |
| tree | 171f3ecdf4a30a116a4b49e70236a47cdabb0ee6 /scripts/git-resolve.sh | |
| parent | Merge tag 'ceph-for-6.17-rc6' of https://github.com/ceph/ceph-client (diff) | |
| parent | erofs: fix long xattr name prefix placement (diff) | |
| download | kernel-f83a4f2a4d8c485922fba3018a64fc8f4cfd315f.tar.gz kernel-f83a4f2a4d8c485922fba3018a64fc8f4cfd315f.zip | |
Merge tag 'erofs-for-6.17-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs
Pull erofs fixes from Gao Xiang:
- Fix invalid algorithm dereference in encoded extents
- Add missing dax_break_layout_final(), since recent FSDAX fixes
didn't cover EROFS
- Arrange long xattr name prefixes more properly
* tag 'erofs-for-6.17-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
erofs: fix long xattr name prefix placement
erofs: fix runtime warning on truncate_folio_batch_exceptionals()
erofs: fix invalid algorithm for encoded extents
Diffstat (limited to 'scripts/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions