linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <aNEcp1CglKxMEe92@finisterre.sirena.org.uk>
Date: Mon, 22 Sep 2025 10:53:43 +0100
From: Mark Brown <broonie@...nel.org>
To: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc: Alice Ryhl <aliceryhl@...gle.com>,
	Beata Michalska <beata.michalska@....com>,
	Carsten Haitzler <carsten.haitzler@...s.arm.com>,
	Daniel Almeida <daniel.almeida@...labora.com>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	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: linux-next: manual merge of the char-misc tree with the drm tree

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>

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)