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

Posted by Mark Brown 1 week, 2 days ago

Hi all,

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

  rust/uapi/uapi_helper.h

between commit:

  cf4fd52e32360 ("rust: drm: Introduce the Tyr driver for Arm Mali GPUs")

from the drm 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/uapi/uapi_helper.h
index d4a239cf2a64f,de3562b08d0c3..0000000000000
--- a/rust/uapi/uapi_helper.h
+++ b/rust/uapi/uapi_helper.h
@@@ -9,7 -9,7 +9,8 @@@
  #include <uapi/asm-generic/ioctl.h>
  #include <uapi/drm/drm.h>
  #include <uapi/drm/nova_drm.h>
 +#include <uapi/drm/panthor_drm.h>
+ #include <uapi/linux/android/binder.h>
  #include <uapi/linux/mdio.h>
  #include <uapi/linux/mii.h>
  #include <uapi/linux/ethtool.h>

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

Posted by Greg KH 1 week, 2 days ago

On Mon, Sep 22, 2025 at 10:53:43AM +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:
> 
>   cf4fd52e32360 ("rust: drm: Introduce the Tyr driver for Arm Mali GPUs")
> 
> from the drm 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/uapi/uapi_helper.h
> index d4a239cf2a64f,de3562b08d0c3..0000000000000
> --- a/rust/uapi/uapi_helper.h
> +++ b/rust/uapi/uapi_helper.h
> @@@ -9,7 -9,7 +9,8 @@@
>   #include <uapi/asm-generic/ioctl.h>
>   #include <uapi/drm/drm.h>
>   #include <uapi/drm/nova_drm.h>
>  +#include <uapi/drm/panthor_drm.h>
> + #include <uapi/linux/android/binder.h>
>   #include <uapi/linux/mdio.h>
>   #include <uapi/linux/mii.h>
>   #include <uapi/linux/ethtool.h>

Looks correct to me, thanks.

greg k-h