linux-next: manual merge of the driver-core.current tree with Linus' tree

Posted by Stephen Rothwell 3 months, 3 weeks ago

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"