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=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 50E03C2D0E5 for ; Fri, 27 Mar 2020 13:51:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 278D6208E4 for ; Fri, 27 Mar 2020 13:51:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BqInddA4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 278D6208E4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5ZVZ50+HsxVrCVsTp0zZRWM5fWYyrtQyktf2GpD1bAI=; b=BqInddA4YGtbYt eFmCCZnjCC1nZNCQ4y55sHjosybdLNUtqq6HSDO5X62iGyCPDUUSuEPlsGeNg8YyZlZc7tjUs96xy JUZ1E04wQrg5rQMJqBZpd0DzQ5epq89X5xJ8gwp2veJTRa0+XMFyclTKw5+TMrB3sj9CuKaxmIsGg Je+jfrr4eailkO4NE5PxFotHz0HEa/+ryoKUG9LbXsUzc/qer2S2vL+PQ/VfQ9NlQ70hJHSq9fPZF kP+HTN2wDsVuOpcHx/8xQv5lilOy1q6RwlnCVCPsOzJeBF7I4ob9MMNPDRsWkgyNQx4ikkxPj7dJS fwaPA9MFHVZKU1oTJW/Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jHpOI-0004hv-B5; Fri, 27 Mar 2020 13:51:18 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jHpO5-0004a1-3l for linux-arm-kernel@lists.infradead.org; Fri, 27 Mar 2020 13:51:06 +0000 Received: from mail-qt1-f182.google.com ([209.85.160.182]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPSA (Nemesis) id 1MS3zP-1ip4N30qlv-00TVHj for ; Fri, 27 Mar 2020 14:51:02 +0100 Received: by mail-qt1-f182.google.com with SMTP id z12so8548326qtq.5 for ; Fri, 27 Mar 2020 06:51:02 -0700 (PDT) X-Gm-Message-State: ANhLgQ3SkNytgxoXQD+haXDK3N5p5gZRifGCuvimmgwhGU0dOScOvqlX lxQuWqEKgmXqky2wESfkJRX8+UCRdNnFdHKIjtE= X-Google-Smtp-Source: ADFU+vshNURS/9HDv+oLa8JQm1ylr9owZmjcnTSkVVaH5iSMiWpwyPAHJ6GKmm1np7lsir9XH7ml3tLULZvcP2HhgCk= X-Received: by 2002:aed:3b4c:: with SMTP id q12mr13766906qte.18.1585317061089; Fri, 27 Mar 2020 06:51:01 -0700 (PDT) MIME-Version: 1.0 References: <20200327092741.1dbd3242@canb.auug.org.au> <20200327131831.GC2282366@ulmo> In-Reply-To: <20200327131831.GC2282366@ulmo> From: Arnd Bergmann Date: Fri, 27 Mar 2020 14:50:45 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: linux-next: manual merge of the tegra tree with the arm-soc tree To: Thierry Reding X-Provags-ID: V03:K1:cptqGsd1fHVwBMWYqzxtdylC4kfzVjRLSWXN8Hj/9ghCYfM17t6 MUUbQyQUmMegypqxdTeQ7BNRK3/mwPOqHnWPpnGKkc35kFqXv0KMgwSMAZmfml4fHk+5DEr gNkGtaTka3Vyxsbw177lYzXXUDULAdY4gyGft/2/MsWH46A49MAWfOHyXF8oI35z5n4uRy5 BKbF23ebBCs3+PcSCBiWQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:ErFATGyI2YY=:B5ABia5bSp9G3XahFh8JJn /GCzshkmhC/quchXHddKmAugTIA55Kl3mlAn1lSNmlbhoBqDV0vHA3vxjaz4wIZcnSEvHSOUL V9gXIhyBaPVGvs0b98/5hXpkioJ1jE4yRRjePirkg9hSaFTgFM7VwvnffTCwvs359CpMaS1eg 81YFyeVT2ox+nDUi+z7M01h8nUmDonlstuIjngRObSBdKCth/UdpGJDhGquhHN0WjyYXNEilW hRoVx88emc6bh9AOK/IrsQvdsQ83V3HWN+FtJjlvdLFn41NpMP0hMuFhR5Vvpd+eHcL3Z5uQ/ kV/gOk+TCg8w5sw1Qq7CEYtUFy4ZZbipyNXyDE9s3YUplna0+LuTFoeIftBDpW7k8lL0wXQoR lxkw5eiG06AOv5EIPQ5npSRp/SIH6SmnUkl39e8aIpBbXL23+uUpkJxzBpaoOvpexuQrLe9HD q9p5XfpW5RIbqVg4dSKplc0P0Z6j060QdUy0Ff1UM55pt34ATU7cNVlYYni6c9U4E1/dkp94D DgW/uetsl2T05Pvd06zNNvX6LpSPbpBOvdwPQJ6k3z2GWigxt3NAqj32WzFl9iaQMmBRKAL/Z mcfhWAkGTHU3e3rcdD3U6gj1fLr5VaVpy2LN+u+PKLG/QOwQqX2YxdIJKovezXW/MzD/Z5EE7 uwqYh4+NeQNm1Jf9Dy/XxY4Ydgt4KBaETbO837X8Aipj6nm8RA05uza1h2w2mIGu/170vTNj+ tg5KFjAzgK3yLMWA6vBiO5KsZctUabM69h3jP0ljT1T1HGI97c4Upp7Hd2m4aapAU0UgNqjWc UetAfmEIqztbZDL4lO1UHgqlmkN5IFkPUrn5HQEBKvV1j9EnHU= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200327_065105_440037_BCAB25EF X-CRM114-Status: GOOD ( 16.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , JC Kuo , Linux Kernel Mailing List , Linux Next Mailing List , Nagarjuna Kristam , Corentin Labbe , Colin Cross , Olof Johansson , ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Mar 27, 2020 at 2:18 PM Thierry Reding wrote: > On Fri, Mar 27, 2020 at 09:27:41AM +1100, Stephen Rothwell wrote: > > I fixed it up (I just used the version from the tegra tree) 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. > > Olof, Arnd, > > There was a bit of back and forth on this because there happened to be a > conflict with the USB tree. I tried to clarify this as replies to the PR > request: > > http://patchwork.ozlabs.org/patch/1254523/ > > But I suspect you may have missed those replies. The bottom line is, > there is a v2 of the pull request that has the patches that are now in > the Tegra tree. That's already part of a PR that went in through the USB > tree as a dependency to resolve the conflict. > > So as a result there should be no need for ARM SoC to carry that PR. But > if you still want to merge it, please pull v2, which is here: > > git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.7-phy-v2 > It was almost at the top of the branch, so I ended up just taking it out now, it should be gone from the soc tree by tomorrow. I think I managed to skip it as you asked on my first pass, but then failed to reread the message when I went through the remaining entries in patchwork. Clearly my tooling still needs a bit of improvement. Arnd _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel