diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-10-09 08:59:14 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-10-09 08:59:22 +0200 |
| commit | a0efa2f362a69e47b9d8b48f770ef3a0249a7911 (patch) | |
| tree | 384d2c79a9b613213ef7591583d820d18c7be9c3 /drivers/gpu/drm/xe/xe_sriov.c | |
| parent | Revert "wifi: cfg80211: unexport wireless_nlevent_flush()" (diff) | |
| parent | net: phy: microchip_t1: SQI support for LAN887x (diff) | |
| download | linux-a0efa2f362a69e47b9d8b48f770ef3a0249a7911.tar.xz linux-a0efa2f362a69e47b9d8b48f770ef3a0249a7911.zip | |
Merge net-next/main to resolve conflicts
The wireless-next tree was based on something older, and there
are now conflicts between -rc2 and work here. Merge net-next,
which has enough of -rc2 for the conflicts to happen, resolving
them in the process.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_sriov.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_sriov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/xe/xe_sriov.c b/drivers/gpu/drm/xe/xe_sriov.c index a274a5fb1401..5a1d65e4f19f 100644 --- a/drivers/gpu/drm/xe/xe_sriov.c +++ b/drivers/gpu/drm/xe/xe_sriov.c @@ -5,7 +5,7 @@ #include <drm/drm_managed.h> -#include "regs/xe_sriov_regs.h" +#include "regs/xe_regs.h" #include "xe_assert.h" #include "xe_device.h" |