linux-kernel - Re: 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 for Android: free password hash cracker in your pocket

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

Date:	Thu, 03 Dec 2015 17:49:16 +0200
From:	Jani Nikula <jani.nikula@...el.com>
To:	Mark Brown <broonie@...nel.org>, Dave Airlie <airlied@...ux.ie>,
	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: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree

On Thu, 03 Dec 2015, Mark Brown <broonie@...nel.org> wrote:
> 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).

Both of these were due to backporting of five patches from our -next
aiming at v4.5 to our -fixes aiming at v4.4. Some more details in my
pull request to Dave [1].

BR,
Jani.


[1] http://mid.gmane.org/87mvtr1t6n.fsf@intel.com


-- 
Jani Nikula, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/