From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@baylibre•com>,
Stephen Boyd <sboyd@codeaurora•org>,
Rob Clark <robdclark@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Hai Li <hali@codeaurora•org>
Subject: linux-next: manual merge of the clk tree with the drm-msm tree
Date: Thu, 13 Aug 2015 16:00:43 +1000 [thread overview]
Message-ID: <20150813160043.651ffef6@canb.auug.org.au> (raw)
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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
reply other threads:[~2015-08-13 6:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150813160043.651ffef6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hali@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@baylibre$(echo .)com \
--cc=robdclark@gmail$(echo .)com \
--cc=sboyd@codeaurora$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox