From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
Arnd Bergmann <arnd@arndb.de>, 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: Re: linux-next: manual merge of the rust tree with the char-misc tree
Date: Fri, 16 Apr 2021 10:10:46 +0200 [thread overview]
Message-ID: <YHlGhmEEQIc8u9uj@kroah.com> (raw)
In-Reply-To: <20210416175806.2acd314b@canb.auug.org.au>
On Fri, Apr 16, 2021 at 05:58:06PM +1000, Stephen Rothwell wrote:
> 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.
Hah, yeah, it is going to hit this and needs to be fixed up in the rust
code. If they really want this as an enum, we can talk about it :)
thanks,
greg k-h
next prev parent reply other threads:[~2021-04-16 8:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 7:58 linux-next: manual merge of the rust tree with the char-misc tree Stephen Rothwell
2021-04-16 8:10 ` Greg KH [this message]
2021-04-16 8:26 ` Stephen Rothwell
2021-04-16 12:31 ` Miguel Ojeda
-- strict thread matches above, loose matches on Subject: below --
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
2024-11-11 6:34 Stephen Rothwell
2024-11-11 14:54 ` Greg KH
2024-11-11 23:56 ` Miguel Ojeda
2024-11-28 1:48 ` Stephen Rothwell
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=YHlGhmEEQIc8u9uj@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=balejs@google.com \
--cc=dualli@google.com \
--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=sfr@canb.auug.org.au \
--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).