linux-next: manual merge of the char-misc tree with the tip tree

linux-next: manual merge of the char-misc tree with the tip tree

[Stephen Rothwell]

Hi all,

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

  arch/x86/kernel/cpu/mshyperv.c

between commit:

  88c9281a9fba ("x86/hyperv: Mark the Hyper-V TSC as unstable")

from the tip tree and commit:

  2517281d63a2 ("Drivers: hv: vmbus: add special kexec handler")

from the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/kernel/cpu/mshyperv.c
index 6fd023d7492d,f794bfa3c138..000000000000
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@@ -141,7 -186,8 +186,10 @@@ static void __init ms_hyperv_init_platf
  	no_timer_check = 1;
  #endif
  
 +	mark_tsc_unstable("running on Hyper-V");
++
+ 	machine_ops.shutdown = hv_machine_shutdown;
+ 	machine_ops.crash_shutdown = hv_machine_crash_shutdown;
  }
  
  const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {

linux-next: manual merge of the char-misc tree with the tip tree

[Stephen Rothwell]

Hi all,

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

  drivers/misc/lkdtm_core.c

between commit:

  8776fe75dc0e ("lkdtm, kprobes: Convert from jprobes to kprobes")

from the tip tree and commits:

  31c5c870a112 ("lkdtm: Convert from jprobe to kprobe")
  75f98b7ab748 ("lkdtm: Constify the crashtypes table")

from the char-misc tree.

[8776fe75dc0e and 31c5c870a112 are the same patch]

I fixed it up (I just usted the latter) 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

linux-next: manual merge of the char-misc tree with the tip tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]

Hi all,

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

  rust/helpers/helpers.c

between commit:

  d9ea5a41cef80 ("rust: sync: Add memory barriers")

from the tip tree and commit:

  eafedbc7c050c ("rust_binder: add Rust Binder driver")

from the char-misc 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.

diff --cc rust/helpers/helpers.c
index 1c6096f53a6fe,8e8277bdddcae..0000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -7,9 -7,8 +7,10 @@@
   * Sorted alphabetically.
   */
  
 +#include "atomic.c"
  #include "auxiliary.c"
 +#include "barrier.c"
+ #include "binder.c"
  #include "blk.c"
  #include "bug.c"
  #include "build_assert.c"

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the tip tree

[Greg KH]

On Mon, Sep 22, 2025 at 10:56:40AM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   rust/helpers/helpers.c
> 
> between commit:
> 
>   d9ea5a41cef80 ("rust: sync: Add memory barriers")
> 
> from the tip tree and commit:
> 
>   eafedbc7c050c ("rust_binder: add Rust Binder driver")
> 
> from the char-misc 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.
> 
> diff --cc rust/helpers/helpers.c
> index 1c6096f53a6fe,8e8277bdddcae..0000000000000
> --- a/rust/helpers/helpers.c
> +++ b/rust/helpers/helpers.c
> @@@ -7,9 -7,8 +7,10 @@@
>    * Sorted alphabetically.
>    */
>   
>  +#include "atomic.c"
>   #include "auxiliary.c"
>  +#include "barrier.c"
> + #include "binder.c"
>   #include "blk.c"
>   #include "bug.c"
>   #include "build_assert.c"

Looks good to me, thanks!

greg k-h

Re: linux-next: manual merge of the char-misc tree with the tip tree

[Boqun Feng]

On Mon, Sep 22, 2025 at 10:56:40AM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   rust/helpers/helpers.c
> 
> between commit:
> 
>   d9ea5a41cef80 ("rust: sync: Add memory barriers")
> 
> from the tip tree and commit:
> 
>   eafedbc7c050c ("rust_binder: add Rust Binder driver")
> 
> from the char-misc 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.
> 
> diff --cc rust/helpers/helpers.c
> index 1c6096f53a6fe,8e8277bdddcae..0000000000000
> --- a/rust/helpers/helpers.c
> +++ b/rust/helpers/helpers.c
> @@@ -7,9 -7,8 +7,10 @@@
>    * Sorted alphabetically.
>    */
>   
>  +#include "atomic.c"
>   #include "auxiliary.c"
>  +#include "barrier.c"
> + #include "binder.c"
>   #include "blk.c"
>   #include "bug.c"
>   #include "build_assert.c"

LGTM, thanks!

Regards,
Boqun