| commit | ba62466d8bd87461da8a945e0e2023f508a897ff | [log] [tgz] |
|---|---|---|
| author | Alexander Martinz <amartinz@shiftphones.com> | Wed Nov 16 15:28:36 2022 +0100 |
| committer | Alexander Martinz <amartinz@shiftphones.com> | Wed Nov 16 15:35:23 2022 +0100 |
| tree | 427ed43eb3ecf32f49a80890203c56b7f91d63a5 | |
| parent | 0cf14e384c2af771a2e07fdf7e9f79e4b0ce8be2 [diff] | |
| parent | dead1f52f936cc27b91c23a78092765f004bf85e [diff] |
Merge branch 'linux-4.9.y' of https://kernel.googlesource.com/pub/scm/linux/kernel/git/jaegeuk/f2fs-stable into lineage-20 Conflicts: - fs/crypto/bio.c - fs/ext4/page-io.c - fs/f2fs/data.c - fs/f2fs/file.c - fs/f2fs/segment.c - include/linux/fscrypt.h - mm/swapfile.c Change-Id: Ibea9796b3a86965708d82f9e915300b917529e93 Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>