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=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no 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 2A456C433FF for ; Tue, 13 Aug 2019 08:54:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E781C20842 for ; Tue, 13 Aug 2019 08:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565686441; bh=5Jyukqt4Utq68hS7TqPYdFq4fD2gKzv+NWjTdQEZTfo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=rLBxr6Vp2lvwP+1GyuUheKtGdCNRypybGg6CLaZ+7B/Xb8/Jrjk9HCBn0E8D+Sh7b mOaEYTUyF4CgOiAAHqo+O9wpT2OgZk9NcN2W6Q4UXkSH/w8P/0O6acLNGZyC+Cz6fl 3C3rlmabBqOq5gL1k0PUbMUeuGqaph0Cqf8UI+zg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728274AbfHMIyA (ORCPT ); Tue, 13 Aug 2019 04:54:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:58418 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727407AbfHMIx6 (ORCPT ); Tue, 13 Aug 2019 04:53:58 -0400 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8DFD82063F; Tue, 13 Aug 2019 08:53:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565686438; bh=5Jyukqt4Utq68hS7TqPYdFq4fD2gKzv+NWjTdQEZTfo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=vmpby7XCWMZSMkqL1uBE1R6f9W2VDDbo/s98BR0Sxbv1MuW62w3Hh9pOkEQi33yAQ lamsoQ2xUe1mZz7lIpW+1wa2tiqfdc48U3TcIuh6/suWgrLSO2MzOli0kdsl/mBLJ6 DG4+D9Pa+p0Ux5IUxlvL498OUfmV8+9PvbR5x/Tg= Date: Tue, 13 Aug 2019 09:53:53 +0100 From: Will Deacon To: Stephen Rothwell Cc: Palmer Dabbelt , Paul Walmsley , Catalin Marinas , Linux Next Mailing List , Linux Kernel Mailing List , Jeremy Linton , Atish Patra Subject: Re: linux-next: manual merge of the risc-v tree with the arm64 tree Message-ID: <20190813085353.v6kpintr35kcwj4y@willie-the-truck> References: <20190813093447.747a5853@canb.auug.org.au> <20190813082422.lecgqtknnn5g4dyj@willie-the-truck> <20190813184211.09b93f31@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190813184211.09b93f31@canb.auug.org.au> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 13, 2019 at 06:42:11PM +1000, Stephen Rothwell wrote: > On Tue, 13 Aug 2019 09:24:23 +0100 Will Deacon wrote: > > > > Paul, Palmer -- If it's not too late, then it would probably be best to > > stick this commit (60c1b220d8bc) and any dependencies on their own stable > > branch so that we can both pull it into our respective trees and I can > > resolve this conflict in the arm64 tree, which I'll send early during the > > merge window. > > > > Looking at your tree, I guess I could just pull in > > common/for-v5.4-rc1/cpu-topology if you promise never to rebase it. Failing > > that, you could fork a new branch from 60c1b220d8bc and I could just pull > > that part instead. > > It may not be worth it, the conflict is not that bad. Unless you > forsee more conflicts arising. Hopefully not, but it looks like it should be dead easy to resolve in this case since the riscv tree doesn't contain anything else and the arm64 stuff is already on its own branch. I'll leave it up to Paul/Palmer to see what they prefer. Will