Thierry needs fd70c7755bf0 ("drm/bridge: tc358767: fix max_tu_symbol value") to be able to merge his dp_link patch series. Some adjacent changes conflicts, plus some clashes in i915 due to cherry-picking and git trying to be helpful and leaving both versions in.
Showing the changes to include/uapi (1 of 706 files). Show all
Unified · Split
| @@ -291,6 +291,6 @@ · 290 unmodified lines | |||
| 291 | #define PORT_SUNIX 121 | 291 | #define PORT_SUNIX 121 |
| 292 | 292 | ||
| 293 | /* Freescale Linflex UART */ | 293 | /* Freescale Linflex UART */ |
| 294 | #define PORT_LINFLEXUART 121 | 294 | #define PORT_LINFLEXUART 122 |
| 295 | 295 | ||
| 296 | #endif /* _UAPILINUX_SERIAL_CORE_H */ | 296 | #endif /* _UAPILINUX_SERIAL_CORE_H */ |