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: Nishanth Menon <nm@ti.com>, Dave Gerlach <d-gerlach@ti.com>,
Keerthy <j-keerthy@ti.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Santosh Shilimkar <ssantosh@kernel.org>
Subject: linux-next: manual merge of the pm tree with the arm-soc tree
Date: Fri, 21 Apr 2017 10:50:53 +1000 [thread overview]
Message-ID: <20170421105053.5df25205@canb.auug.org.au> (raw)
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/soc/ti/ti_sci_pm_domains.c
between commit:
52835d59fc6c ("soc: ti: Add ti_sci_pm_domains driver")
from the arm-soc tree and commit:
112572283742 ("soc: ti: Add ti_sci_pm_domains driver")
from the pm tree.
I fixed it up (I used the pm tree version, but it was an arbitrary
choice as the only difference is the URL in the Copyright line) 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
next reply other threads:[~2017-04-21 0:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 0:50 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-21 0:00 linux-next: manual merge of the pm tree with the arm-soc tree Stephen Rothwell
2017-04-21 0:54 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-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=20170421105053.5df25205@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=d-gerlach@ti.com \
--cc=j-keerthy@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nm@ti.com \
--cc=olof@lixom.net \
--cc=rjw@rjwysocki.net \
--cc=ssantosh@kernel.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