tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'asm-generic-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic fixes from Arnd Bergmann:
"The header cleanup series from Masahiro Yamada ended up causing some
regressions in the ABI because of an ambigous uid_t type.

This was only caught after the original patches got merged, but at
least the fixes are trivial and hopefully complete"

* tag 'asm-generic-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
binder: fix sender_euid type in uapi header
sparc: fix mis-use of __kernel_{uid,gid}_t in uapi/asm/stat.h
powerpc: use __kernel_{uid,gid}32_t in uapi/asm/stat.h
mips: use __kernel_{uid,gid}32_t in uapi/asm/stat.h

Linus Torvalds baf86ac1 09a01817

+11 -11
+6 -6
arch/mips/include/uapi/asm/stat.h
··· 22 22 __kernel_ino_t st_ino; 23 23 __kernel_mode_t st_mode; 24 24 __u32 st_nlink; 25 - __kernel_uid_t st_uid; 26 - __kernel_gid_t st_gid; 25 + __kernel_uid32_t st_uid; 26 + __kernel_gid32_t st_gid; 27 27 unsigned st_rdev; 28 28 long st_pad2[2]; 29 29 long st_size; ··· 58 58 __kernel_mode_t st_mode; 59 59 __u32 st_nlink; 60 60 61 - __kernel_uid_t st_uid; 62 - __kernel_gid_t st_gid; 61 + __kernel_uid32_t st_uid; 62 + __kernel_gid32_t st_gid; 63 63 64 64 unsigned long st_rdev; 65 65 unsigned long st_pad1[3]; /* Reserved for st_rdev expansion */ ··· 99 99 __kernel_mode_t st_mode; 100 100 __u32 st_nlink; 101 101 102 - __kernel_uid_t st_uid; 103 - __kernel_gid_t st_gid; 102 + __kernel_uid32_t st_uid; 103 + __kernel_gid32_t st_gid; 104 104 105 105 unsigned int st_rdev; 106 106 unsigned int st_pad1[3]; /* Reserved for st_rdev expansion */
+2 -2
arch/powerpc/include/uapi/asm/stat.h
··· 37 37 __kernel_mode_t st_mode; 38 38 unsigned short st_nlink; 39 39 #endif 40 - __kernel_uid_t st_uid; 41 - __kernel_gid_t st_gid; 40 + __kernel_uid32_t st_uid; 41 + __kernel_gid32_t st_gid; 42 42 unsigned long st_rdev; 43 43 long st_size; 44 44 unsigned long st_blksize;
+2 -2
arch/sparc/include/uapi/asm/stat.h
··· 11 11 __kernel_ino_t st_ino; 12 12 __kernel_mode_t st_mode; 13 13 short st_nlink; 14 - __kernel_uid_t st_uid; 15 - __kernel_gid_t st_gid; 14 + __kernel_uid32_t st_uid; 15 + __kernel_gid32_t st_gid; 16 16 unsigned int st_rdev; 17 17 long st_size; 18 18 long st_atime;
+1 -1
include/uapi/linux/android/binder.h
··· 289 289 /* General information about the transaction. */ 290 290 __u32 flags; 291 291 __kernel_pid_t sender_pid; 292 - __kernel_uid_t sender_euid; 292 + __kernel_uid32_t sender_euid; 293 293 binder_size_t data_size; /* number of bytes of data */ 294 294 binder_size_t offsets_size; /* number of bytes of offsets */ 295 295