* linux-next: manual merge of the clk tree with the qcom tree
@ 2023-08-02 0:04 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2023-08-02 0:04 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd, Andy Gross
Cc: Bjorn Andersson, Dmitry Baryshkov, Linux Kernel Mailing List,
Linux Next Mailing List, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 773 bytes --]
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/qcom/lcc-mdm9615.c
between commit:
bac4675a4d1b ("clk: qcom: drop lcc-mdm9615 in favour of lcc-msm8960")
from the qcom tree and commit:
a96cbb146a97 ("clk: Explicitly include correct DT includes")
from the clk tree.
I fixed it up (the former removed the file, so I just did that) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-08-02 0:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-02 0:04 linux-next: manual merge of the clk tree with the qcom tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox