The exynos-next pull is based on a newer -rc than drm-next. hence backmerge first to make sure the unrelated conflicts we accumulated don't end up randomly in the exynos merge pull, but are separated out. Conflicts are all benign: Adjacent changes in amdgpu and fbdev-dma code, and cherry-pick conflict in xe.
Showing the changes to include/uapi (2 of 776 files). Show all
Unified · Split
| @@ -737,7 +737,7 @@ __SC_COMP(__NR_pselect6_time64, sys_pselect6, compat_sys_pselect6_time64) · 736 unmodified lines | ||
| 737 | 737 | #define __NR_ppoll_time64 414 |
| 738 | 738 | __SC_COMP(__NR_ppoll_time64, sys_ppoll, compat_sys_ppoll_time64) |
| 739 | 739 | #define __NR_io_pgetevents_time64 416 |
| 740 | −__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents) | |
| 740 | +__SC_COMP(__NR_io_pgetevents_time64, sys_io_pgetevents, compat_sys_io_pgetevents_time64) | |
| 741 | 741 | #define __NR_recvmmsg_time64 417 |
| 742 | 742 | __SC_COMP(__NR_recvmmsg_time64, sys_recvmmsg, compat_sys_recvmmsg_time64) |
| 743 | 743 | #define __NR_mq_timedsend_time64 418 |
| @@ -126,8 +126,8 @@ struct statx { · 125 unmodified lines | ||
| 126 | 126 | __u64 stx_mnt_id; |
| 127 | 127 | __u32 stx_dio_mem_align; /* Memory buffer alignment for direct I/O */ |
| 128 | 128 | __u32 stx_dio_offset_align; /* File offset alignment for direct I/O */ |
| 129 | − __u64 stx_subvol; /* Subvolume identifier */ | |
| 130 | 129 | /* 0xa0 */ |
| 130 | + __u64 stx_subvol; /* Subvolume identifier */ | |
| 131 | 131 | __u64 __spare3[11]; /* Spare space for future expansion */ |
| 132 | 132 | /* 0x100 */ |
| 133 | 133 | }; |