diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 12:48:49 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 12:48:49 +0300 |
commit | f6b2ce79b5fbbb330f56262f0f4373d6af60b602 (patch) | |
tree | 1228dd9989b03011b9c5b5bd193283dfa8321ec4 /fs/squashfs/squashfs_fs_sb.h | |
parent | fbe7e38f3e57e38916ae7f248fd6efafeb9ecdd3 (diff) | |
parent | 4ec5183ec48656cec489c49f989c508b68b518e3 (diff) | |
download | linux-f6b2ce79b5fbbb330f56262f0f4373d6af60b602.tar.xz |
Merge 6.2-rc7 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/squashfs/squashfs_fs_sb.h')
-rw-r--r-- | fs/squashfs/squashfs_fs_sb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/squashfs_fs_sb.h b/fs/squashfs/squashfs_fs_sb.h index 659082e9e51d..72f6f4b37863 100644 --- a/fs/squashfs/squashfs_fs_sb.h +++ b/fs/squashfs/squashfs_fs_sb.h @@ -63,7 +63,7 @@ struct squashfs_sb_info { long long bytes_used; unsigned int inodes; unsigned int fragments; - int xattr_ids; + unsigned int xattr_ids; unsigned int ids; bool panic_on_errors; const struct squashfs_decompressor_thread_ops *thread_ops; |