Skip to contentSkip to conversation

linux-next: manual merge of the kbuild tree with the rust tree

PATCH Mark Brown 2 participants 2 messages Oct 5

Subsystems (2)
Kbuild Linux-next tree
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

Today's linux-next merge of the kbuild tree got a conflict in:

scripts/remove-stale-files

between commit:

a41ec2936d2fe ("rust: doctest: generate Rust kunit test suites")

from the rust tree and commit:

33bef82263082 ("kbuild: Move gen_init_cpio and gen_initramfs.sh to scripts/")

from the kbuild 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.

scripts/remove-stale-files +0 -0
diff --cc scripts/remove-stale-files
index f1f776caae00a,e46337e4bfb8f..0000000000000
@@@ -27,4 -27,4 +27,6 @@@ rm -f *.spe
  
  rm -f lib/test_fortify.log
  
 +rm -f rust/doctests_kernel_generated_kunit.c
++
+ rm -f usr/gen_init_cpio
maintainer
#1 lore raw
Quoted 28 lines · Mark Brown

Hi all,

Today's linux-next merge of the kbuild tree got a conflict in:

scripts/remove-stale-files

between commit:

a41ec2936d2fe ("rust: doctest: generate Rust kunit test suites")

from the rust tree and commit:

33bef82263082 ("kbuild: Move gen_init_cpio and gen_initramfs.sh to scripts/")

from the kbuild 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.

scripts/remove-stale-files +0 -0
diff --cc scripts/remove-stale-files
index f1f776caae00a,e46337e4bfb8f..0000000000000

scripts/remove-stale-files

Quoted 6 lines
scripts/remove-stale-files +2 -0
@@@ -27,4 -27,4 +27,6 @@@ rm -f *.spe
 
  rm -f lib/test_fortify.log
 
 +rm -f rust/doctests_kernel_generated_kunit.c
++
+ rm -f usr/gen_init_cpio

Thanks, looks good to me.

Signature · 2 lines
Cheers,
Nathan