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

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

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  fbb0de795078 ("Add udmabuf misc device")

from the drm tree and commit:

  9793c1fd1775 ("MAINTAINERS: Clarify UIO vs UIOVEC maintainer")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 7d70a6c5eeee,a38c13c7da9a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15594,14 -15365,12 +15595,20 @@@ F:	arch/x86/um
  F:	fs/hostfs/
  F:	fs/hppfs/
  
+ USERSPACE COPYIN/COPYOUT (UIOVEC)
+ M:	Alexander Viro <viro@zeniv.linux.org.uk>
+ S:	Maintained
+ F:	lib/iov_iter.c
+ F:	include/linux/uio.h
+ 
 +USERSPACE DMA BUFFER DRIVER
 +M:	Gerd Hoffmann <kraxel@redhat.com>
 +S:	Maintained
 +L:	dri-devel@lists.freedesktop.org
 +F:	drivers/dma-buf/udmabuf.c
 +F:	include/uapi/linux/udmabuf.h
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
 +
  USERSPACE I/O (UIO)
  M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:	Maintained

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

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

[Greg KH]

On Wed, Oct 17, 2018 at 02:22:57PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   fbb0de795078 ("Add udmabuf misc device")
> 
> from the drm tree and commit:
> 
>   9793c1fd1775 ("MAINTAINERS: Clarify UIO vs UIOVEC maintainer")
> 
> from the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Looks good to me, thanks.

greg k-h

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

[Mark Brown]

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

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>

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

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

[Greg KH]

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