From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E05B2C433ED for ; Fri, 16 Apr 2021 07:58:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C14036117A for ; Fri, 16 Apr 2021 07:58:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229502AbhDPH6f (ORCPT ); Fri, 16 Apr 2021 03:58:35 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:39925 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239776AbhDPH6e (ORCPT ); Fri, 16 Apr 2021 03:58:34 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4FM7qf6TPHz9sWD; Fri, 16 Apr 2021 17:58:06 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1618559889; bh=j4tYcesejEmcgz3sJDlYJMq9NB1n+aTVqj5kiiFvkp8=; h=Date:From:To:Cc:Subject:From; b=EG9pWrtl1p5D6BOmh4DvvUrFczJUj9z4DILh+5SEfxPoOvygJ3z7fEKRtQ1VQL+45 /hWXHMABlYs4WbUCn9S4DLzXQLJxa2QdAz8Ztj9VoZU4YIstXU0tMWetRrBkciYHB+ L1qllqVn3pl7dfiDLh9tn4kv/Q6Orfjxn+UiBbBjH8Dn/mE9goplN7PRkpbEbO09st nmtW2SwauCwmUm1GuDdbJ3aitbE8bvgBVMGmo0ZINAmrZE6MII+s+EcKHF6VFoTsit i4JURGLajM1d/6+XUZ20O2W+0zOVsnyjhf+pg4JJ9Toz69xReSF2YzJYblEz8lN1W8 o4zjiAqffg5hQ== Date: Fri, 16 Apr 2021 17:58:06 +1000 From: Stephen Rothwell To: Miguel Ojeda , Greg KH , Arnd Bergmann Cc: Greg Kroah-Hartman , Hang Lu , Li Li , Linux Kernel Mailing List , Linux Next Mailing List , Marco Ballesio , Miguel Ojeda , Todd Kjos , Wedson Almeida Filho Subject: linux-next: manual merge of the rust tree with the char-misc tree Message-ID: <20210416175806.2acd314b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/DcS0KhKm_NOzQ7KFh5ShvdQ"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/DcS0KhKm_NOzQ7KFh5ShvdQ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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 dete= cted 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. --=20 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=20 __u32 reserved3; }; =20 +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_debu= g_info) - #define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_in= fo_for_ref) - #define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_objec= t) - #define BINDER_FREEZE _IOW('b', 14, struct binder_freeze_info) - #define BINDER_GET_FROZEN_INFO _IOWR('b', 15, struct binder_frozen_statu= s_info) - #define BINDER_ENABLE_ONEWAY_SPAM_DETECTION _IOW('b', 16, __u32) + enum { + BINDER_WRITE_READ =3D _IOWR('b', 1, struct binder_write_read), + BINDER_SET_IDLE_TIMEOUT =3D _IOW('b', 3, __s64), + BINDER_SET_MAX_THREADS =3D _IOW('b', 5, __u32), + BINDER_SET_IDLE_PRIORITY =3D _IOW('b', 6, __s32), + BINDER_SET_CONTEXT_MGR =3D _IOW('b', 7, __s32), + BINDER_THREAD_EXIT =3D _IOW('b', 8, __s32), + BINDER_VERSION =3D _IOWR('b', 9, struct binder_version), + BINDER_GET_NODE_DEBUG_INFO =3D _IOWR('b', 11, struct binder_node_debug_i= nfo), + BINDER_GET_NODE_INFO_FOR_REF =3D _IOWR('b', 12, struct binder_node_info_= for_ref), + BINDER_SET_CONTEXT_MGR_EXT =3D _IOW('b', 13, struct flat_binder_object), ++ BINDER_FREEZE =3D _IOW('b', 14, struct binder_freeze_info) ++ BINDER_GET_FROZEN_INFO =3D _IOWR('b', 15, struct binder_frozen_status_i= nfo) ++ BINDER_ENABLE_ONEWAY_SPAM_DETECTION =3D _IOW('b', 16, __u32) + }; =20 /* * NOTE: Two special error codes you should check for when calling --Sig_/DcS0KhKm_NOzQ7KFh5ShvdQ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmB5Q44ACgkQAVBC80lX 0GxJiwgAkPJQvsnVUNQYplQn6ivTUXjVdx7vxc0tEKp3K00MG9K674dn506f2THB Xllg0x2S9m1KW7CrF26FHUKbjfEoxFItP/1Pj/BASo77/Cc3ty476/0jd8Anfsnr XLIwAQNraEDoVC6Kekuyjrx3yQPmNCx44KbatxsQ8Q5mMvT7sjmjD/7Ck2Z7RQns /U8m7Tia2GEG2Yl8tS81VDp8aRdTBBybTD2NA7w7RaSDZXBBODB/ckSihfmwsFa1 H87S5qZlKd43IN0H5T48Y9pp4Ypam9SenQ9Unos3FWaFNYVip3O/WNXIlUeSHBG7 8CMw19OUL42QU/OZWO3opq9AZbfxdA== =IBIc -----END PGP SIGNATURE----- --Sig_/DcS0KhKm_NOzQ7KFh5ShvdQ--