From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Hawkins, Nick" <nick.hawkins@hpe.com>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
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>
Subject: Re: linux-next: manual merge of the arm-soc tree with Linus' tree
Date: Sat, 28 May 2022 10:29:46 +1000 [thread overview]
Message-ID: <20220528102946.341c3bbb@canb.auug.org.au> (raw)
In-Reply-To: <DM4PR84MB19271EE54D445DD8F1DB047988D89@DM4PR84MB1927.NAMPRD84.PROD.OUTLOOK.COM>
[-- Attachment #1.1: Type: text/plain, Size: 1333 bytes --]
Hi Nick,
On Fri, 27 May 2022 15:38:56 +0000 "Hawkins, Nick" <nick.hawkins@hpe.com> wrote:
>
> > 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.
>
> Hi Stephen,
>
> Thank you for resolving the merge issue. I am relatively new to this
> process.. Can you provide a link to where you were notified of the
> merge conflict?
The purpose of linux-next (which is my project) is integration testing,
so I spend all day merging the branches that Linus will merge during
the merge window. The conflict appeared when I merged the arm-soc tree
yesterday.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-05-28 0:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 0:39 linux-next: manual merge of the arm-soc tree with Linus' tree Stephen Rothwell
2022-05-27 15:38 ` Hawkins, Nick
2022-05-28 0:29 ` Stephen Rothwell [this message]
-- 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
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=20220528102946.341c3bbb@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).