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

2021-04-16 Thread Miguel Ojeda
Hi Stephen, On Fri, Apr 16, 2021 at 9:58 AM Stephen Rothwell wrote: > > from the char-misc tree and commit: > > 1fed5dee5fbb ("Android: Binder IPC in Rust (WIP)") > > from the rust tree. If you prefer, I can take out the binder bits from rust-next since they will be submitted separately anyhow

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

2021-04-16 Thread Stephen Rothwell
Hi all, On Fri, 16 Apr 2021 17:58:06 +1000 Stephen Rothwell wrote: > > 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_IN

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

2021-04-16 Thread Greg KH
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_FR

linux-next: manual merge of the rust tree with the char-misc tree

2021-04-16 Thread Stephen Rothwell
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 wh