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.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT 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 748A2C10F13 for ; Tue, 16 Apr 2019 14:04:32 +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 45FAD223A8 for ; Tue, 16 Apr 2019 14:04:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ckufYw4R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45FAD223A8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nS/nZMWFIIa/L4C/k8J19WFPl8th3Zyay1kvsL+ys4I=; b=ckufYw4RzYUyFu YLo3ciKd7VzQogxUYUhLjMfREsI8JEDcoRhseTBCwagvhXslpljpQ05bFl+6s4O98A5FpnGJ3zroo DAJoTZdqbXUyxWayPxgu47y7D8dlFnSS6F8szlZZRmGPVvO+h3OVCe4O97hxZ7EluUJAe/SI1HnW1 vhGqjDzY49m+XaknYupPcKS9dBPiCiF06SjZprJajKQHvt7aRiaJcX9x2x42JlD69BN1HLUZXR/F8 eV8FNw4XYfHd7esqjymwXOWB1aE4l8BsHVyzGlyVpXjYBaAnqHGMqmSar/XTaMGaPAWJia1x+/+la IQxUxbu4vOtWaI2tWlnw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGOhH-0004Mc-5E; Tue, 16 Apr 2019 14:04:27 +0000 Received: from muru.com ([72.249.23.125]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGOh8-0004MB-Ri for linux-arm-kernel@lists.infradead.org; Tue, 16 Apr 2019 14:04:25 +0000 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 86F7C8081; Tue, 16 Apr 2019 14:04:33 +0000 (UTC) Date: Tue, 16 Apr 2019 07:04:14 -0700 From: Tony Lindgren To: Thierry Reding Subject: Re: [PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7 Message-ID: <20190416140414.GD2839@atomide.com> References: <20190411091848.16949-1-thierry.reding@gmail.com> <20190411091848.16949-3-thierry.reding@gmail.com> <20190415172357.GC2839@atomide.com> <20190416074444.GA10907@ulmo> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190416074444.GA10907@ulmo> User-Agent: Mutt/1.11.4 (2019-03-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190416_070418_936348_46D8111C X-CRM114-Status: GOOD ( 16.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, Dmitry Osipenko , linux-arm-kernel@lists.infradead.org, Jon Hunter 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 * Thierry Reding [190416 07:45]: > On Mon, Apr 15, 2019 at 10:23:57AM -0700, Tony Lindgren wrote: > > Hi Thierry, > > > > * Thierry Reding [190411 09:19]: > > > --- a/arch/arm/configs/multi_v7_defconfig > > > +++ b/arch/arm/configs/multi_v7_defconfig > > > @@ -141,6 +141,7 @@ CONFIG_ARM_CPUIDLE=y > > > CONFIG_ARM_ZYNQ_CPUIDLE=y > > > CONFIG_ARM_EXYNOS_CPUIDLE=y > > > CONFIG_KERNEL_MODE_NEON=y > > > +CONFIG_TRUSTED_FOUNDATIONS=y > > > CONFIG_NET=y > > > CONFIG_PACKET=y > > > CONFIG_UNIX=y > > > > I'm updating my branch for make savedefconfig clean-up > > for multi_v7_defconfig as posted earlier in thread > > "[PATCHv2 0/2] Update multi_v7_defconfig for dropped > > and moved options", looks like this commit causes > > a trivial merge conflict. > > > > Can we consider your branch immutable for commit > > 8b695aa58cc4 ("ARM: Enable Trusted Foundations for > > multiplatform ARM v7")? > > In general, the for-next branch from the Tegra tree is not stable. The > individual branches that make up for-next are. In this case it would be > for-5.2/arm/defconfig. However... > > > I'd like to merge that one in to avoid an unecessary > > merge conflict. > > It's slightly tricky because I generated the multi_v7_defconfig on top > of a different branch (because the TRUSTED_FOUNDATIONS symbol moves > around in that branch), so if you base your update on top of my branch, > the symbol will likely get moved around again. > > Perhaps better would be if you provide a stable branch with the update > and then I can rebase this patch on top. > > Would that work for you? OK sure, I'll push out a branch against v5.1-rc1 with just the savedefconfig changes. Regards, Tony _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel