diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-10-10 13:50:17 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-10-10 16:12:21 +0300 |
| commit | 105f1a65b04a8f4f7abec11b200b1fb54f3d4b46 (patch) | |
| tree | a33c65845ec5b8e3ba9257dc4030344c410476d0 /net/netrom/sysctl_net_netrom.c | |
| parent | 449f6615473db3a0d16cbafcbe0572ef81872db0 (diff) | |
drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next
The conflict resolution of v4.8-rc8 backmerge to drm-next pulled back in
a few lines of dead code due to the code movement around
i915_gem_reset(), fix that up.
Fixes: ca09fb9f60b5 ("Merge tag 'v4.8-rc8' into drm-next")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161010125017.23911-1-chris@chris-wilson.co.uk
Diffstat (limited to 'net/netrom/sysctl_net_netrom.c')
0 files changed, 0 insertions, 0 deletions