From: Thierry Reding <thierry.reding@gmail.com>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-tegra@vger.kernel.org, Dmitry Osipenko <digetx@gmail.com>,
linux-arm-kernel@lists.infradead.org,
Jon Hunter <jonathanh@nvidia.com>
Subject: Re: [PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7
Date: Tue, 16 Apr 2019 09:44:44 +0200 [thread overview]
Message-ID: <20190416074444.GA10907@ulmo> (raw)
In-Reply-To: <20190415172357.GC2839@atomide.com>
[-- Attachment #1.1: Type: text/plain, Size: 1549 bytes --]
On Mon, Apr 15, 2019 at 10:23:57AM -0700, Tony Lindgren wrote:
> Hi Thierry,
>
> * Thierry Reding <thierry.reding@gmail.com> [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?
Thierry
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-04-16 7:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-11 9:18 [PATCH 1/3] ARM: tegra: Update default configuration for v5.1-rc1 Thierry Reding
2019-04-11 9:18 ` [PATCH 2/3] ARM: tegra: Enable Trusted Foundations by default Thierry Reding
2019-04-11 9:18 ` [PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7 Thierry Reding
2019-04-15 17:23 ` Tony Lindgren
2019-04-16 7:44 ` Thierry Reding [this message]
2019-04-16 14:04 ` Tony Lindgren
2019-04-11 12:01 ` [PATCH 1/3] ARM: tegra: Update default configuration for v5.1-rc1 Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190416074444.GA10907@ulmo \
--to=thierry.reding@gmail.com \
--cc=digetx@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-tegra@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).