We want the fixes in here, and we can resolve a merge issue in drivers/iio/industrialio-trigger.c
Showing the changes to include/uapi/linux (2 of 561 files). Show all
Unified · Split
| @@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 { · 117 unmodified lines | |||
| 118 | }; | 118 | }; |
| 119 | union { | 119 | union { |
| 120 | char name[BTRFS_SUBVOL_NAME_MAX + 1]; | 120 | char name[BTRFS_SUBVOL_NAME_MAX + 1]; |
| 121 | u64 devid; | 121 | __u64 devid; |
| 122 | }; | 122 | }; |
| 123 | }; | 123 | }; |
| 124 | 124 | ||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _UAPI_LINUX_GTP_H_ | 1 | #ifndef _UAPI_LINUX_GTP_H_ |
| 2 | #define _UAPI_LINUX_GTP_H__ | 2 | #define _UAPI_LINUX_GTP_H_ |
| 3 | 3 | ||
| 4 | enum gtp_genl_cmds { | 4 | enum gtp_genl_cmds { |
| 5 | GTP_CMD_NEWPDP, | 5 | GTP_CMD_NEWPDP, |