From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: "Andrew F. Davis" <afd@ti.com>,
Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Santosh Shilimkar <santosh.shilimkar@oracle.com>,
Suman Anna <s-anna@ti.com>, Tero Kristo <t-kristo@ti.com>,
Ulf Hansson <ulf.hansson@linaro.org>
Subject: linux-next: manual merge of the pm tree with the arm-soc tree
Date: Wed, 21 Oct 2020 11:00:49 +1100 [thread overview]
Message-ID: <20201021110049.61cc4f61@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1207 bytes --]
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
drivers/soc/ti/Makefile
between commit:
dc1129564a01 ("soc: ti: pruss: Add a platform driver for PRUSS in TI SoCs")
from the arm-soc tree and commit:
bca815d62054 ("PM: AVS: smartreflex Move driver to soc specific drivers")
from the pm tree.
I fixed it up (see below) 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
diff --cc drivers/soc/ti/Makefile
index 18129aa557df,5463431ec96c..000000000000
--- a/drivers/soc/ti/Makefile
+++ b/drivers/soc/ti/Makefile
@@@ -12,4 -12,4 +12,5 @@@ obj-$(CONFIG_TI_SCI_PM_DOMAINS) += ti_
obj-$(CONFIG_TI_SCI_INTA_MSI_DOMAIN) += ti_sci_inta_msi.o
obj-$(CONFIG_TI_K3_RINGACC) += k3-ringacc.o
obj-$(CONFIG_TI_K3_SOCINFO) += k3-socinfo.o
+obj-$(CONFIG_TI_PRUSS) += pruss.o
+ obj-$(CONFIG_POWER_AVS_OMAP) += smartreflex.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-10-21 0:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 0:00 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-04-21 0:54 linux-next: manual merge of the pm tree with the arm-soc tree Stephen Rothwell
2017-04-21 5:53 ` Arnd Bergmann
2017-04-21 6:39 ` santosh.shilimkar
2017-04-21 9:31 ` Arnd Bergmann
2017-04-21 21:02 ` santosh.shilimkar
2017-04-21 21:31 ` Rafael J. Wysocki
2017-04-21 21:50 ` Santosh Shilimkar
2017-04-21 21:44 ` Arnd Bergmann
2017-04-21 21:54 ` Santosh Shilimkar
2017-04-24 18:02 ` Dave Gerlach
2017-04-24 18:22 ` Santosh Shilimkar
2017-04-21 0:50 Stephen Rothwell
2017-04-20 0:34 Stephen Rothwell
2017-04-20 0:38 ` Rafael J. Wysocki
2016-04-29 1:18 Stephen Rothwell
2014-09-10 4:18 Stephen Rothwell
2014-09-10 23:29 ` Rafael J. Wysocki
2014-09-10 4:14 Stephen Rothwell
2014-07-30 2:23 Stephen Rothwell
2014-07-30 12:55 ` Rafael J. Wysocki
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=20201021110049.61cc4f61@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=afd@ti.com \
--cc=arnd@arndb.de \
--cc=grzegorz.jaszczyk@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
--cc=s-anna@ti.com \
--cc=santosh.shilimkar@oracle.com \
--cc=t-kristo@ti.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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