linux-kernel - linux-next: manual merge of the drm tree with the drm-intel-fixes 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20151203145139.512bebac25c08506a1791a5b@kernel.org>
Date:	Thu, 3 Dec 2015 14:51:39 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Dave Airlie <airlied@...ux.ie>,
	Jani Nikula <jani.nikula@...el.com>,
	Ville Syrjälä 
	<ville.syrjala@...ux.intel.com>, Imre Deak <imre.deak@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	dri-devel@...ts.freedesktop.org
Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes
 tree

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_hdmi.c between commit ac9b8236551d1 ("drm/i915:
Introduce a gmbus power domain") from the drm-intel-fixes tree and commit 
69172f210e9fffaf8 ("drm/i915: take a power domain ref only when needed
during HDMI detect") from the drm tree.

I fixed it up (again resulting in a null diff) and can carry the fix as
necessary (no action is required).

Content of type "application/pgp-signature" skipped