From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Laurent Vivier <laurent@vivier.eu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Nick Hawkins <nick.hawkins@hpe.com>
Subject: linux-next: manual merge of the arm-soc tree with Linus' tree
Date: Fri, 27 May 2022 10:39:16 +1000 [thread overview]
Message-ID: <20220527103916.52768f74@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
drivers/clocksource/Makefile
between commit:
c92e7ef16400 ("clocksource/drivers: Add a goldfish-timer clocksource")
from Linus' tree and commit:
5184f4bf151b ("clocksource/drivers/timer-gxp: Add HPE GXP Timer")
from the arm-soc 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/clocksource/Makefile
index 833cfb7a96c1,98017abf6c03..000000000000
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -85,4 -88,4 +85,5 @@@ obj-$(CONFIG_GX6605S_TIMER) += timer-g
obj-$(CONFIG_HYPERV_TIMER) += hyperv_timer.o
obj-$(CONFIG_MICROCHIP_PIT64B) += timer-microchip-pit64b.o
obj-$(CONFIG_MSC313E_TIMER) += timer-msc313e.o
+obj-$(CONFIG_GOLDFISH_TIMER) += timer-goldfish.o
+ obj-$(CONFIG_GXP_TIMER) += timer-gxp.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-05-27 0:39 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 0:39 Stephen Rothwell [this message]
2022-05-27 15:38 ` linux-next: manual merge of the arm-soc tree with Linus' tree Hawkins, Nick
2022-05-28 0:29 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-06-23 22:54 Stephen Rothwell
2018-10-28 23:14 Stephen Rothwell
2018-10-29 15:02 ` Tony Lindgren
2018-10-28 23:08 Stephen Rothwell
2016-09-05 0:58 Stephen Rothwell
2016-09-05 18:26 ` Russell King - ARM Linux
2016-09-06 10:17 ` Arnd Bergmann
2016-09-06 10:42 ` Russell King - ARM Linux
2016-09-25 16:07 ` Robert Jarzmik
2016-01-20 22:40 Stephen Rothwell
2015-08-23 23:55 Stephen Rothwell
2015-06-01 0:25 Stephen Rothwell
2015-06-01 7:12 ` Michal Simek
2014-01-30 0:19 Stephen Rothwell
2014-01-30 5:33 ` Kevin Hilman
2014-01-30 21:47 ` Mike Turquette
2014-01-23 0:23 Stephen Rothwell
2013-08-27 8:29 Stephen Rothwell
2013-08-27 16:17 ` Stephen Warren
2013-08-28 0:06 ` Stephen Rothwell
2013-08-27 8:26 Stephen Rothwell
2013-07-08 4:03 Stephen Rothwell
2013-03-18 3:49 Stephen Rothwell
2012-10-04 4:33 Stephen Rothwell
2012-07-30 2:53 Stephen Rothwell
2012-03-15 6:50 Stephen Rothwell
2012-03-15 9:51 ` Laurent Pinchart
2012-03-15 20:01 ` Arnd Bergmann
2012-03-15 21:36 ` Rafael J. Wysocki
2012-03-08 6:07 Stephen Rothwell
2011-11-24 0:58 Stephen Rothwell
2011-11-24 15:55 ` Arnd Bergmann
2011-11-06 23:33 Stephen Rothwell
2011-11-07 19:07 ` Arnd Bergmann
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=20220527103916.52768f74@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=geert@linux-m68k.org \
--cc=laurent@vivier.eu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nick.hawkins@hpe.com \
--cc=olof@lixom.net \
/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;
as well as URLs for NNTP newsgroup(s).