From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@baylibre•com>,
Stephen Boyd <sboyd@kernel•org>, Andy Gross <agross@kernel•org>
Cc: Bjorn Andersson <andersson@kernel•org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rob Herring <robh@kernel•org>
Subject: linux-next: manual merge of the clk tree with the qcom tree
Date: Wed, 2 Aug 2023 10:04:13 +1000 [thread overview]
Message-ID: <20230802100413.199544b8@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2023-08-02 0:04 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=20230802100413.199544b8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@kernel$(echo .)org \
--cc=andersson@kernel$(echo .)org \
--cc=dmitry.baryshkov@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@baylibre$(echo .)com \
--cc=robh@kernel$(echo .)org \
--cc=sboyd@kernel$(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