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

Posted by Mark Brown 1 month, 2 weeks ago

Hi all,

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

  rust/uapi/uapi_helper.h

between commit:

  cdfcaa36ac93a ("rust: uapi: replace direct asm-generic/ioctl.h include with linux/ioctl.h")

from the rust tree and commit:

  f14e0c8183bc7 ("rust_binder: report netlink transactions")

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 include/uapi/linux/kvm.h
index 70e36e6a0ad4b,9fc8dfdfd65ff..0000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -997,7 -997,7 +997,8 @@@ struct kvm_enable_cap 
  #define KVM_CAP_S390_KEYOP 247
  #define KVM_CAP_S390_VSIE_ESAMODE 248
  #define KVM_CAP_S390_HPAGE_2G 249
 -#define KVM_CAP_ARM_PMU_V3_STRICT 250
 +#define KVM_CAP_PPC_COMPAT_CAPS 250
++#define KVM_CAP_ARM_PMU_V3_STRICT 251
  
  struct kvm_irq_routing_irqchip {
  	__u32 irqchip;

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

Posted by Carlos Llamas 1 month, 2 weeks ago

On Tue, Aug 11, 2026 at 04:15:34PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   rust/uapi/uapi_helper.h
> 
> between commit:
> 
>   cdfcaa36ac93a ("rust: uapi: replace direct asm-generic/ioctl.h include with linux/ioctl.h")
> 
> from the rust tree and commit:
> 
>   f14e0c8183bc7 ("rust_binder: report netlink transactions")

I don't think this commit touches the file mentioned below. Maybe the
conflict was in rust/uapi/uapi_helper.h with the header includes?


> 
> 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 include/uapi/linux/kvm.h
> index 70e36e6a0ad4b,9fc8dfdfd65ff..0000000000000
> --- a/include/uapi/linux/kvm.h
> +++ b/include/uapi/linux/kvm.h
> @@@ -997,7 -997,7 +997,8 @@@ struct kvm_enable_cap 
>   #define KVM_CAP_S390_KEYOP 247
>   #define KVM_CAP_S390_VSIE_ESAMODE 248
>   #define KVM_CAP_S390_HPAGE_2G 249
>  -#define KVM_CAP_ARM_PMU_V3_STRICT 250
>  +#define KVM_CAP_PPC_COMPAT_CAPS 250
> ++#define KVM_CAP_ARM_PMU_V3_STRICT 251
>   
>   struct kvm_irq_routing_irqchip {
>   	__u32 irqchip;

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

Posted by Mark Brown 1 month, 2 weeks ago

On Tue, Aug 11, 2026 at 04:22:13PM +0000, Carlos Llamas wrote:
> On Tue, Aug 11, 2026 at 04:15:34PM +0100, Mark Brown wrote:

> > Today's linux-next merge of the char-misc tree got a conflict in:
> > 
> >   rust/uapi/uapi_helper.h

...

> > from the rust tree and commit:

> >   f14e0c8183bc7 ("rust_binder: report netlink transactions")

> I don't think this commit touches the file mentioned below. Maybe the
> conflict was in rust/uapi/uapi_helper.h with the header includes?

Yes, sorry, forgot to update the diff before sending.

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

Posted by Miguel Ojeda 1 month, 2 weeks ago

On Tue, Aug 11, 2026 at 7:02 PM Mark Brown <broonie@kernel.org> wrote:
>
> Yes, sorry, forgot to update the diff before sending.

I forgot to reply, but the actual diff looked good, thanks Mark.

Cheers,
Miguel