linux-kernel - linux-next: manual merge of the clk tree with the drm-msm 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: <20150813160043.651ffef6@canb.auug.org.au>
Date:	Thu, 13 Aug 2015 16:00:43 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mike Turquette <mturquette@...libre.com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	Rob Clark <robdclark@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hai Li <hali@...eaurora.org>
Subject: linux-next: manual merge of the clk tree with the drm-msm tree

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c

between commit:

  bdbc06e2309b ("drm/msm/dsi: Save/Restore PLL status across PHY reset")

from the drm-msm tree and commit:

  3dde2c2b968a ("drm/msm/dsi: Convert to clk_hw based provider APIs")

from the clk tree.

I fixed it up (the former removed some of the code updated by the latter)
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/
--
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/