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]

Message-Id: <20121130122209.2df445e05e638738a0739f25@canb.auug.org.au>
Date:	Fri, 30 Nov 2012 12:22:09 +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,
	Kelly Doran <kel.p.doran@...il.com>,
	Ben Skeggs <bskeggs@...hat.com>
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/nouveau/core/engine/disp/nv50.c between commit
11d92561c81b ("drm/nvc0/disp: fix regression in vblank semaphore
release") from Linus' tree and commit 370c00f939c5 ("drm/nv50/disp:
initial implementation of the various channel object classes") 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/nouveau/core/engine/disp/nv50.c
index 15b182c,c6f8005..0000000
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
@@@ -22,7 -22,10 +22,11 @@@
   * Authors: Ben Skeggs
   */

+ #include <core/object.h>
+ #include <core/parent.h>
+ #include <core/handle.h>
+ #include <core/class.h>
 +#include <subdev/bar.h>

  #include <engine/software.h>
  #include <engine/disp.h>

Content of type "application/pgp-signature" skipped