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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <2025092219-prude-irrigate-9821@gregkh>
Date: Mon, 22 Sep 2025 14:04:28 +0200
From: Greg KH <greg@...ah.com>
To: Mark Brown <broonie@...nel.org>
Cc: Arnd Bergmann <arnd@...db.de>, Alice Ryhl <aliceryhl@...gle.com>,
	Beata Michalska <beata.michalska@....com>,
	Carsten Haitzler <carsten.haitzler@...s.arm.com>,
	Daniel Almeida <daniel.almeida@...labora.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Matt Gilbride <mattgilbride@...gle.com>,
	Rob Herring <robh@...nel.org>,
	Wedson Almeida Filho <wedsonaf@...il.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the drm tree

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