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: <20150511130706.5d62d3fa@canb.auug.org.au>
Date:	Mon, 11 May 2015 13:07:06 +1000
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,
	Mario Kleiner <mario.kleiner.de@...il.com>,
	Daniel Vetter <daniel@...ll.ch>,
	Ville Syrjälä <ville.syrjala@...ux.intel.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/drm_irq.c between commit fdb68e09bbb1 ("drm: Zero out invalid vblank timestamp in drm_update_vblank_count") from Linus' tree and commit d66a1e38280c ("drm: Zero out invalid vblank timestamp in drm_update_vblank_count. (v2)") from the drm tree.

I fixed it up (a rebased version of a patch that is already in Linus'
tree :-( - I used the version from the drm tree) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped