linux-kernel - linux-next: manual merge of the drm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 19 Dec 2013 12:59:13 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dave Airlie <airlied@...ux.ie>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ilia Mirkin <imirkin@...m.mit.edu>,
	Daniel Vetter <daniel.vetter@...ll.ch>
Subject: linux-next: manual merge of the drm tree with Linus' tree

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_stub.c between commit 0f58411d4fd7 ("drm: don't
double-free on driver load error") from Linus' tree and commit
2c695fa04442 ("drm: remove agp_init() bus callback") from the drm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/gpu/drm/drm_stub.c
index 66dd3a001cf1,a4a5c6ac110a..000000000000
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@@ -566,14 -564,11 +564,11 @@@ err_unload
  	if (dev->driver->unload)
  		dev->driver->unload(dev);
  err_primary_node:
 -	drm_put_minor(dev->primary);
 +	drm_unplug_minor(dev->primary);
  err_render_node:
 -	drm_put_minor(dev->render);
 +	drm_unplug_minor(dev->render);
  err_control_node:
 -	drm_put_minor(dev->control);
 +	drm_unplug_minor(dev->control);
- err_agp:
- 	if (dev->driver->bus->agp_destroy)
- 		dev->driver->bus->agp_destroy(dev);
  out_unlock:
  	mutex_unlock(&drm_global_mutex);
  	return ret;

Content of type "application/pgp-signature" skipped