Thomas Zimermann needs 8d6ef26501 ("drm/ast: Disconnect BMC if physical connector is connected") for further ast work in -next. Minor conflicts in ivpu between 3de6d9597892 ("accel/ivpu: Pass D0i3 residency time to the VPU firmware") and 3f7c0634926d ("accel/ivpu/37xx: Fix hangs related to MMIO reset") changing adjacent lines.
Showing the changes to include/uapi (1 of 247 files). Show all
Unified · Split
| @@ -116,5 +116,8 @@ · 115 unmodified lines | ||
| 116 | 116 | #define AT_HANDLE_FID AT_REMOVEDIR /* file handle is needed to |
| 117 | 117 | compare object identity and may not |
| 118 | 118 | be usable to open_by_handle_at(2) */ |
| 119 | +#if defined(__KERNEL__) | |
| 120 | +#define AT_GETATTR_NOSEC 0x80000000 | |
| 121 | +#endif | |
| 119 | 122 | |
| 120 | 123 | #endif /* _UAPI_LINUX_FCNTL_H */ |