From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro•org>
Cc: Arnd Bergmann <arnd@arndb•de>,
Hans de Goede <hdegoede@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Marek Maslanka <mmaslanka@google•com>
Subject: linux-next: manual merge of the clockevents tree with Linus' tree
Date: Mon, 28 Oct 2024 15:10:20 +1100 [thread overview]
Message-ID: <20241028151020.32157f3f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
Hi all,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/platform/x86/intel/pmc/core.c
between commit:
5fa607880168 ("platform/x86:intel/pmc: Revert "Enable the ACPI PM Timer to be turned off when suspended"")
from Linus' tree and commit:
d7a87891e2f5 ("platform/x86:intel/pmc: fix build regression with pmtimer turned off")
from the clockevents tree.
I fixed it up (the former removes the code updated by the latter, so I
just used 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:[~2024-10-28 4:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-28 4:10 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-06-11 5:24 linux-next: manual merge of the clockevents tree with Linus' tree Stephen Rothwell
2016-06-07 3:03 Stephen Rothwell
2016-02-17 2:38 Stephen Rothwell
2013-12-20 4:09 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=20241028151020.32157f3f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=hdegoede@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mmaslanka@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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