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 2BC1EC19F2A for ; Wed, 3 Aug 2022 09:28:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237455AbiHCJ25 (ORCPT ); Wed, 3 Aug 2022 05:28:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237328AbiHCJ24 (ORCPT ); Wed, 3 Aug 2022 05:28:56 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74BF25A141; Wed, 3 Aug 2022 02:28:55 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id d80so139925iof.12; Wed, 03 Aug 2022 02:28:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=dle9h48PzYrkYr1tEeCiB+iPlZLQESDR0z8su/KIJjw=; b=SjCPfeSZxmX/VGg4XUmntqZW/LhY+g7FpTih/fKj6p03FRSrdbF9ku60KR337JA6om zl3tihPq0ufDHx3sJW0AVs/52CNGFFETb/5YlNXtxX0CqJ0l5A0H0BZTteXSxyXtzd78 JkCXnzlaBGTAU/KYQViDgBaDF0a13LnaeYtM5ZIIHeVZhYONkAFa0juUpiibWYAgGbw9 QXhCndSY39zKkqgiTYe7WJUCwY1f7jAX0TnD8gi6IhC9H2J2nY4A1g4wpuKvIO4f3aIv PN7PJ8QdiWxpjwtVOtAZ7OPAi21Oi0iIdfXtslActBnJkXz0nZqk8ssoP/+4erCiE0Ko LF5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dle9h48PzYrkYr1tEeCiB+iPlZLQESDR0z8su/KIJjw=; b=kNUP1EWBY/2j6z6jpzY5lps7hvcFQ3Xwpe1f4jb5BOZUP6BZs76DgeJOj0GMy3csz7 XbzsIwVh06+FjWGG/5QiatxqogA23qg12jMcwSDloXgkh9KGmGib91hXWipb0AE0xkFX llC4DJ7BECNX+b58+7wBojuXD+q+NZHV/uwJBCUQWW+UEs3NQ8QbDsBFNO+i21vQ6N+N DobvLOSVWzzGtc/JdUKL+utiyu/oSgYjN8TFPC7g7KUO2ENpkTIMIGB3PXmZXNohaBHL hjwSfXLadgIh227uskzOJfQ4FGx202axdK6y6h58vE1THnbmoEMvVA0Y4l9+7TbPoVeW SKnw== X-Gm-Message-State: ACgBeo3jSZNGDiKSP6BhtaIaaWJ1+OROMd1jpHXGkbERWTIY//PNcMTs +YGQMvNl3gEsvqThBCucwA5Gp3VxaNKg4ygEuJM= X-Google-Smtp-Source: AA6agR7jqNitVhgGQyxl1ogBL3e5zRTPtT4aJap1SIZpVFW4uU+kJY7eDxHzwAHUWrA0U4TG29EoiIGseMbk8uTHpus= X-Received: by 2002:a6b:e511:0:b0:67f:9ef6:5779 with SMTP id y17-20020a6be511000000b0067f9ef65779mr4860634ioc.177.1659518934836; Wed, 03 Aug 2022 02:28:54 -0700 (PDT) MIME-Version: 1.0 References: <20220802233844.2613013-1-broonie@kernel.org> In-Reply-To: <20220802233844.2613013-1-broonie@kernel.org> From: Miguel Ojeda Date: Wed, 3 Aug 2022 11:28:43 +0200 Message-ID: Subject: Re: linux-next: manual merge of the rust tree with the kbuild tree To: broonie@kernel.org Cc: Adam Bratschi-Kaye , Alex Gaynor , Antonio Terceiro , =?UTF-8?Q?Bj=C3=B6rn_Roy_Baron?= , Boqun Feng , Boris-Chengbiao Zhou , Daniel Xu , Dariusz Sosnowski , David Gow , Douglas Su , Finn Behrens , Gary Guo , Linux Kernel Mailing List , Linux Next Mailing List , Martin Rodriguez Reboredo , Masahiro Yamada , Michael Ellerman , Miguel Cano , Miguel Ojeda , Nick Desaulniers , Sven Van Asbroeck , Tiago Lam , Wedson Almeida Filho Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 3, 2022 at 1:38 AM wrote: > > 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. Looks good to me! Thanks! Cheers, Miguel