linux-kernel - linux-next: manual merge of the clockevents tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20241028151020.32157f3f@canb.auug.org.au>
Date: Mon, 28 Oct 2024 15:10:20 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: Arnd Bergmann <arnd@...db.de>, Hans de Goede <hdegoede@...hat.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Marek Maslanka
 <mmaslanka@...gle.com>
Subject: linux-next: manual merge of the clockevents tree with Linus' tree

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

Content of type "application/pgp-signature" skipped