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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EA6DC433F5 for ; Mon, 18 Oct 2021 11:33:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4C91F60F9D for ; Mon, 18 Oct 2021 11:33:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229843AbhJRLfR (ORCPT ); Mon, 18 Oct 2021 07:35:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229569AbhJRLfQ (ORCPT ); Mon, 18 Oct 2021 07:35:16 -0400 Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6A6FC06161C; Mon, 18 Oct 2021 04:33:05 -0700 (PDT) Received: by mail-io1-xd2b.google.com with SMTP id b188so10893696iof.8; Mon, 18 Oct 2021 04:33:05 -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=E7ifO5BVPgOaaNdJsY38xuA6JsGENgZFJ6DdNp9B7wI=; b=ENJ2zN3PxW0z7Kh5XQhf9ew/rE6C/uB8Go5bnJl+x8nGzFLQdfrHYS7cUGSTueUSEG f2KJDYcc/fDrxUEU00wkp5KV8HlMi68pJHLSam9/+iclrMZFvrxwfDCMtR7qmZjVzHOw Nr3tNUtLy1lJHcIFnrdtfZlEPpYk34LtIFrMrwxkQnmFs/EdwejchZ/AcgNzspH3JwY8 YOCExRgN5CgIvKA5GQ7FR3Je0JcRtqKMBHwRxfN6WMy0NRssPRrUwgpdgGhCIKkoXk3o psUieB91kllLiLkrq+HfyP91iPYwZ73L04WxKhg63ZldQVaV7vY6y8g9hSkOXCFYY440 LrVQ== 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=E7ifO5BVPgOaaNdJsY38xuA6JsGENgZFJ6DdNp9B7wI=; b=O6SfxsDE3O6dqzEPosmANVZMkl46aECSTIEuoxcNZf6GzM6giMmR5k11VVa9DBAFAP MF3jEVXAFFmQFNrMGvFzj6ONMN7jyS/Rj15sQASwD1pxjVsgaFzBcZyKpkLdm/yDA5M6 4rs6R2WxXP1RKYHd90+czZn5J37mKRJoECdwDycmsv6qD+JApg1yRJja36WSnZsPdbUK MKuWI+R2MRcJ01nlSVrYQE4Xb1jTfg/pAfTfU1ldJdXREf4wmuY1F5AWhoTLDg+Ygldz orgKkNUkAqMY4pDlDlcBrN1kU84nLK2mf6o32+DPSm/Aq2vF0Gp01VTPsUr42vgfUrez RKOQ== X-Gm-Message-State: AOAM531WqGI5DguYaBwNoloZFNmJpi0utanpCmbvlxHxrk2OBhb9CDBa WwN8IOsrDiD3337nddtj5FcXHpUyKmMGSRVhAU0= X-Google-Smtp-Source: ABdhPJxFgtvgU3knHtiUQXMNalkS0mgyH/u1KxHLmjWwMqIDNUSuvJzt2siSzEozgXUzHwELOXILvCfbq0791S+CgJ8= X-Received: by 2002:a05:6602:2d4e:: with SMTP id d14mr14339267iow.172.1634556785457; Mon, 18 Oct 2021 04:33:05 -0700 (PDT) MIME-Version: 1.0 References: <20211018155113.1303fa5e@canb.auug.org.au> In-Reply-To: <20211018155113.1303fa5e@canb.auug.org.au> From: Miguel Ojeda Date: Mon, 18 Oct 2021 13:32:54 +0200 Message-ID: Subject: Re: linux-next: manual merge of the rust tree with the bpf-next tree To: Stephen Rothwell Cc: Daniel Borkmann , Alexei Starovoitov , David Miller , Networking , Adam Bratschi-Kaye , Alex Gaynor , Ayaan Zaidi , Boqun Feng , Boris-Chengbiao Zhou , Douglas Su , Finn Behrens , Fox Chen , Gary Guo , Geoffrey Thomas , Kumar Kartikeya Dwivedi , Linux Kernel Mailing List , Linux Next Mailing List , Michael Ellerman , Miguel Ojeda , Sumera Priyadarsini , Sven Van Asbroeck , Wedson Almeida Filho , Yuki Okushi Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Oct 18, 2021 at 6:51 AM Stephen Rothwell 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 correct, thanks Stephen! I am glad you didn't have more conflicts after the rebase to v5.15-rc5. Cheers, Miguel