diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-10-24 09:50:22 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-10-24 09:50:22 +0100 |
| commit | c5a746fc1ba4b35a7fc211762cb19d907305b82e (patch) | |
| tree | 14f2d32b3e9b21209bba87a9bbd725ccd17ac26b /drivers/net/wireguard/selftest/counter.c | |
| parent | bd98276752096479b67e77e674012a35da023d7d (diff) | |
| parent | 4fdf7c204c58bf7e5819aa97b0a75b2a17a2c9c1 (diff) | |
| download | wireguard-linux-trimmed-c5a746fc1ba4b35a7fc211762cb19d907305b82e.tar.gz wireguard-linux-trimmed-c5a746fc1ba4b35a7fc211762cb19d907305b82e.zip | |
Merge drm/drm-next into drm-intel-gt-next
Work that needs to land in drm-intel-gt-next depends on two patches only
present in drm-intel-next, absence of which is causing a merge conflict:
3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS")
ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions