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 (3 of 561 files). Show all
Unified · Split
| @@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 { · 117 unmodified lines | ||
| 118 | 118 | }; |
| 119 | 119 | union { |
| 120 | 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 | 1 | #ifndef _UAPI_LINUX_GTP_H_ |
| 2 | −#define _UAPI_LINUX_GTP_H__ | |
| 2 | +#define _UAPI_LINUX_GTP_H_ | |
| 3 | 3 | |
| 4 | 4 | enum gtp_genl_cmds { |
| 5 | 5 | GTP_CMD_NEWPDP, |
| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | # UAPI Header export list |
| 2 | 2 | header-y += asequencer.h |
| 3 | +header-y += asoc.h | |
| 3 | 4 | header-y += asound.h |
| 4 | 5 | header-y += asound_fm.h |
| 5 | 6 | header-y += compress_offload.h |
| @@ -10,3 +11,5 @@ header-y += hdsp.h · 4 unmodified lines | ||
| 10 | 11 | header-y += hdspm.h |
| 11 | 12 | header-y += sb16_csp.h |
| 12 | 13 | header-y += sfnt_info.h |
| 14 | +header-y += tlv.h | |
| 15 | +header-y += usb_stream.h | |