diff options
author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2024-10-12 11:22:25 +0100 |
---|---|---|
committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2024-10-12 11:43:29 +0100 |
commit | 220c71dafaa28cbb75fd785670cf68a758347026 (patch) | |
tree | 47a974cd3ea71ba59116037b56a509c41a430b63 /fs/erofs/zmap.c | |
parent | 6a9262edff8ea44e9968b6b271c36d81c6a1f841 (diff) | |
parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) | |
download | lwn-220c71dafaa28cbb75fd785670cf68a758347026.tar.gz lwn-220c71dafaa28cbb75fd785670cf68a758347026.zip |
Merge tag 'v6.12-rc2' into test2
Linux 6.12-rc2
Resolved movement of asm/unaligned.h to linux/unaligned.h
Diffstat (limited to 'fs/erofs/zmap.c')
-rw-r--r-- | fs/erofs/zmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c index e980e29873a5..1253a8456e59 100644 --- a/fs/erofs/zmap.c +++ b/fs/erofs/zmap.c @@ -4,7 +4,7 @@ * https://www.huawei.com/ */ #include "internal.h" -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <trace/events/erofs.h> struct z_erofs_maprecorder { |