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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98617C433F5 for ; Mon, 21 Mar 2022 06:43:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344633AbiCUGoo (ORCPT ); Mon, 21 Mar 2022 02:44:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344625AbiCUGoi (ORCPT ); Mon, 21 Mar 2022 02:44:38 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3EAA13DE9; Sun, 20 Mar 2022 23:43:12 -0700 (PDT) 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 4KMQ6c2Vkpz4xRB; Mon, 21 Mar 2022 17:43:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1647844987; bh=cz6ekqfIqPBFlhDzuYDWDUWzUPqnlYRI1w9LAehsuAE=; h=Date:From:To:Cc:Subject:From; b=mFOxCJvnp2pYkscfBSN2sxCg84CmEYDSoPeDggoxT7Pp4EfxB1xjWbosMpKjj+ASJ 7/3rydam24YBQpv5U7Lv58GFYFxNYYp/349uv8WRU3f4Dg1B5PWV+nMNmIhn3fsJt2 IyiSQWi5D0WFgTMONKAUIMSfn39RSqHOaLN0JNU+G5NlM1AW7zFHOTHEcZ6r/KI0Al 9bTYGDHAIiZbH2iCzZC/5mrRRjet3PLUtU8vzIJOQqG0m5WGx+fe+HQpIzHAgjfAZ8 5mTpUMLtHayPv1rqo5I1OmTJ9egP5hO+6aAbsKwLygHeOoCeYdQ9hu50L/R0Hby01b kn9EUMlqrXX0w== Date: Mon, 21 Mar 2022 17:43:01 +1100 From: Stephen Rothwell To: Miguel Ojeda , Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko Cc: bpf , Networking , Alex Gaynor , Ayaan Zaidi , Boris-Chengbiao Zhou , Finn Behrens , Gary Guo , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Masami Hiramatsu , Miguel Ojeda , Milan Landaverde , "Steven Rostedt (Google)" , Sven Van Asbroeck , Wedson Almeida Filho Subject: linux-next: manual merge of the rust tree with the bpf-next tree Message-ID: <20220321174301.3a1b3943@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/=q_KJTYcwUDjXRGJHMvX+7q"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/=q_KJTYcwUDjXRGJHMvX+7q 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: samples/Makefile between commit: 6ee64cc3020b ("fprobe: Add sample program for fprobe") from the bpf-next tree and commit: 44d687f85cc3 ("samples: add Rust examples") 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 samples/Makefile index 701e912ab5af,fc5e9760ea32..000000000000 --- a/samples/Makefile +++ b/samples/Makefile @@@ -34,4 -33,4 +34,5 @@@ subdir-$(CONFIG_SAMPLE_WATCHDOG) +=3D wat subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) +=3D watch_queue obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) +=3D kmemleak/ obj-$(CONFIG_SAMPLE_CORESIGHT_SYSCFG) +=3D coresight/ +obj-$(CONFIG_SAMPLE_FPROBE) +=3D fprobe/ + obj-$(CONFIG_SAMPLES_RUST) +=3D rust/ --Sig_/=q_KJTYcwUDjXRGJHMvX+7q Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmI4HnUACgkQAVBC80lX 0Gx+TAf/ZUzpK+OgNBF8vnv5tJEOS9KA2q9qTLkp/oAxS+GoPBwlE29XtqcNsM3C 0jvHhQRHhQX2EHwYicsStxfoCy8DA5PL5ECmSCGv66Kc2Hen7hbkEr+MoS5ARaCQ DLDz/mE31dw2MqGaGWPQXfmCJCd4V0dMRVqa4ZUs+J5YhUFC3SPH9lY6C179ET7G LXWowatY5BhHPQ3fIO7jCrumVhYkSLd0BkejTwfDat61rUQCygICgfv8WJBLmiak Wpwy13DKjEJlAHfsamtE8eKramai//72OrWbkBivU3wRZ49XsBayTSF7iS2kv+lD taRDgLA3mI8EFJeOQO0oT+9vFxobNQ== =7Vas -----END PGP SIGNATURE----- --Sig_/=q_KJTYcwUDjXRGJHMvX+7q--