From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Hang Lu <hangl@codeaurora.org>, Li Li <dualli@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Marco Ballesio <balejs@google.com>,
Miguel Ojeda <ojeda@kernel.org>, Todd Kjos <tkjos@google.com>,
Wedson Almeida Filho <wedsonaf@google.com>
Subject: linux-next: manual merge of the rust tree with the char-misc tree
Date: Fri, 16 Apr 2021 17:58:06 +1000 [thread overview]
Message-ID: <20210416175806.2acd314b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3226 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
include/uapi/linux/android/binder.h
between commits:
432ff1e91694 ("binder: BINDER_FREEZE ioctl")
ae28c1be1e54 ("binder: BINDER_GET_FROZEN_INFO ioctl")
a7dc1e6f99df ("binder: tell userspace to dump current backtrace when detected oneway spamming")
from the char-misc tree and commit:
1fed5dee5fbb ("Android: Binder IPC in Rust (WIP)")
from the rust 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 include/uapi/linux/android/binder.h
index 20e435fe657a,7b13c9e9aa2f..000000000000
--- a/include/uapi/linux/android/binder.h
+++ b/include/uapi/linux/android/binder.h
@@@ -217,31 -217,18 +217,33 @@@ struct binder_node_info_for_ref
__u32 reserved3;
};
+struct binder_freeze_info {
+ __u32 pid;
+ __u32 enable;
+ __u32 timeout_ms;
+};
+
+struct binder_frozen_status_info {
+ __u32 pid;
+ __u32 sync_recv;
+ __u32 async_recv;
+};
+
- #define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read)
- #define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, __s64)
- #define BINDER_SET_MAX_THREADS _IOW('b', 5, __u32)
- #define BINDER_SET_IDLE_PRIORITY _IOW('b', 6, __s32)
- #define BINDER_SET_CONTEXT_MGR _IOW('b', 7, __s32)
- #define BINDER_THREAD_EXIT _IOW('b', 8, __s32)
- #define BINDER_VERSION _IOWR('b', 9, struct binder_version)
- #define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info)
- #define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref)
- #define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object)
- #define BINDER_FREEZE _IOW('b', 14, struct binder_freeze_info)
- #define BINDER_GET_FROZEN_INFO _IOWR('b', 15, struct binder_frozen_status_info)
- #define BINDER_ENABLE_ONEWAY_SPAM_DETECTION _IOW('b', 16, __u32)
+ enum {
+ BINDER_WRITE_READ = _IOWR('b', 1, struct binder_write_read),
+ BINDER_SET_IDLE_TIMEOUT = _IOW('b', 3, __s64),
+ BINDER_SET_MAX_THREADS = _IOW('b', 5, __u32),
+ BINDER_SET_IDLE_PRIORITY = _IOW('b', 6, __s32),
+ BINDER_SET_CONTEXT_MGR = _IOW('b', 7, __s32),
+ BINDER_THREAD_EXIT = _IOW('b', 8, __s32),
+ BINDER_VERSION = _IOWR('b', 9, struct binder_version),
+ BINDER_GET_NODE_DEBUG_INFO = _IOWR('b', 11, struct binder_node_debug_info),
+ BINDER_GET_NODE_INFO_FOR_REF = _IOWR('b', 12, struct binder_node_info_for_ref),
+ BINDER_SET_CONTEXT_MGR_EXT = _IOW('b', 13, struct flat_binder_object),
++ BINDER_FREEZE = _IOW('b', 14, struct binder_freeze_info)
++ BINDER_GET_FROZEN_INFO = _IOWR('b', 15, struct binder_frozen_status_info)
++ BINDER_ENABLE_ONEWAY_SPAM_DETECTION = _IOW('b', 16, __u32)
+ };
/*
* NOTE: Two special error codes you should check for when calling
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-04-16 7:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 7:58 Stephen Rothwell [this message]
2021-04-16 8:10 ` linux-next: manual merge of the rust tree with the char-misc tree Greg KH
2021-04-16 8:26 ` Stephen Rothwell
2021-04-16 12:31 ` Miguel Ojeda
2022-05-16 7:13 Stephen Rothwell
2022-05-16 7:49 ` Greg KH
2022-05-16 8:18 ` Miguel Ojeda
2022-05-16 8:27 ` 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=20210416175806.2acd314b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=balejs@google.com \
--cc=dualli@google.com \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=hangl@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=ojeda@kernel.org \
--cc=tkjos@google.com \
--cc=wedsonaf@google.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;
as well as URLs for NNTP newsgroup(s).