linux-kernel - linux-next: manual merge of the drm tree with the 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: <20151203144147.b0f3aef5c02437f44cae6a5d@kernel.org>
Date:	Thu, 3 Dec 2015 14:41:47 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Dave Airlie <airlied@...ux.ie>,
	Jani Nikula <jani.nikula@...el.com>,
	Patrik Jakobsson <patrik.jakobsson@...ux.intel.com>,
	Imre Deak <imre.deak@...el.com>,
	Ville Syrjälä 
	<ville.syrjala@...ux.intel.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  tree

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in 
drivers/gpu/drm/i915/intel_runtime_pm.c between commit
ac9b8236551d11 ("drm/i915: Introduce a gmbus power domain") from the
drm-intel-fixes tree and commit 73dfc227ff5c8e005 ("drm/i915/skl: init/uninit
display core as part of the HW power domain state") from the drm tree. It
also seems like the gmbus power domain commit has been added in both trees.

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

Content of type "application/pgp-signature" skipped