From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Kelley <mikelley@microsoft.com>
Subject: linux-next: manual merge of the clockevents tree with the tip tree
Date: Fri, 23 Jun 2023 11:56:49 +1000 [thread overview]
Message-ID: <20230623115649.3736ac66@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 821 bytes --]
Hi all,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/hyperv_timer.c
between commit:
e39acc37db34 ("clocksource: hyper-v: Provide noinstr sched_clock()")
from the tip tree and commit:
f23dab716a66 ("clocksource/drivers/hyper-v: Rework clocksource and sched clock setup")
from the clockevents tree.
I fixed it up (the latter removed a function changed by the former) 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 --]
next reply other threads:[~2023-06-23 2:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 1:56 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-26 5:08 linux-next: manual merge of the clockevents tree with the tip tree Stephen Rothwell
2015-12-21 3:08 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=20230623115649.3736ac66@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.lezcano@linaro.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mikelley@microsoft.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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).