From: Mark Brown <broonie@kernel.org>
To: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Alice Ryhl <aliceryhl@google.com>,
Beata Michalska <beata.michalska@arm.com>,
Carsten Haitzler <carsten.haitzler@foss.arm.com>,
Daniel Almeida <daniel.almeida@collabora.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Matt Gilbride <mattgilbride@google.com>,
Rob Herring <robh@kernel.org>,
Wedson Almeida Filho <wedsonaf@gmail.com>
Subject: linux-next: manual merge of the char-misc tree with the drm tree
Date: Mon, 22 Sep 2025 10:53:43 +0100 [thread overview]
Message-ID: <aNEcp1CglKxMEe92@finisterre.sirena.org.uk> (raw)
[-- 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 --]
next reply other threads:[~2025-09-22 9:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-22 9:53 Mark Brown [this message]
2025-09-22 12:04 ` linux-next: manual merge of the char-misc tree with the drm tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2018-10-17 3:22 Stephen Rothwell
2018-10-17 5:01 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aNEcp1CglKxMEe92@finisterre.sirena.org.uk \
--to=broonie@kernel.org \
--cc=aliceryhl@google.com \
--cc=arnd@arndb.de \
--cc=beata.michalska@arm.com \
--cc=carsten.haitzler@foss.arm.com \
--cc=daniel.almeida@collabora.com \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mattgilbride@google.com \
--cc=robh@kernel.org \
--cc=wedsonaf@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox