linux-kernel - linux-next: manual merge of the driver-core.current 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: <20250616093830.49011634@canb.auug.org.au>
Date: Mon, 16 Jun 2025 09:38:30 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: Danilo Krummrich <dakr@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Viresh Kumar <viresh.kumar@...aro.org>
Subject: linux-next: manual merge of the driver-core.current tree with
 Linus' tree

Hi all,

Today's linux-next merge of the driver-core.current tree got a conflict
in:

  rust/helpers/helpers.c

between commit:

  c7f005f70d22 ("rust: cpu: Add CpuId::current() to retrieve current CPU ID")

from Linus' tree and commit:

  1b56e765bf89 ("rust: completion: implement initial abstraction")

from the driver-core.current 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 rust/helpers/helpers.c
index 16fa9bca5949,6451cfd94a8d..000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -13,7 -13,7 +13,8 @@@
  #include "build_assert.c"
  #include "build_bug.c"
  #include "clk.c"
+ #include "completion.c"
 +#include "cpu.c"
  #include "cpufreq.c"
  #include "cpumask.c"
  #include "cred.c"

Content of type "application/pgp-signature" skipped