[PATCH 1/3] ARM: tegra: Update default configuration for v5.1-rc1

[PATCH 1/3] ARM: tegra: Update default configuration for v5.1-rc1

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Most of the changes here are just symbols that are now enabled by
default, have been removed, or which have been moved around and now
appear in a different spot.

The only notable change here is that BACKLIGHT_CLASS_DEVICE is now
built-in. This is to allow BACKLIGHT_PWM to be built-in as well.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/configs/tegra_defconfig | 35 +++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index c7b99ebf5fcf..5708e58fe516 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -1,6 +1,7 @@
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CGROUPS=y
@@ -14,23 +15,9 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_TEGRA=y
-CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_TEGRA=y
 CONFIG_SMP=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
-CONFIG_CMA=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_KEXEC=y
@@ -40,6 +27,12 @@ CONFIG_CPUFREQ_DT=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_CMA=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -73,10 +66,12 @@ CONFIG_MAC80211=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_GPIO=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_TEGRA=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_TEGRA_GMI=y
 CONFIG_MTD=y
 CONFIG_MTD_M25P80=y
@@ -152,7 +147,6 @@ CONFIG_WATCHDOG=y
 CONFIG_TEGRA_WATCHDOG=y
 CONFIG_MFD_AS3722=y
 CONFIG_MFD_CROS_EC=y
-CONFIG_MFD_CROS_EC_SPI=y
 CONFIG_MFD_MAX8907=y
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_PALMAS=y
@@ -180,6 +174,7 @@ CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_TEGRA=y
 CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -288,6 +283,10 @@ CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRC_CCITT=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
 CONFIG_MAGIC_SYSRQ=y
@@ -300,5 +299,3 @@ CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRC_CCITT=y
-- 
2.21.0

[PATCH 1/3] ARM: tegra: Update default configuration for v5.1-rc1

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Most of the changes here are just symbols that are now enabled by
default, have been removed, or which have been moved around and now
appear in a different spot.

The only notable change here is that BACKLIGHT_CLASS_DEVICE is now
built-in. This is to allow BACKLIGHT_PWM to be built-in as well.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/configs/tegra_defconfig | 35 +++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index c7b99ebf5fcf..5708e58fe516 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -1,6 +1,7 @@
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CGROUPS=y
@@ -14,23 +15,9 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_TEGRA=y
-CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_TEGRA=y
 CONFIG_SMP=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
-CONFIG_CMA=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_KEXEC=y
@@ -40,6 +27,12 @@ CONFIG_CPUFREQ_DT=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_CMA=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -73,10 +66,12 @@ CONFIG_MAC80211=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_GPIO=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_TEGRA=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_TEGRA_GMI=y
 CONFIG_MTD=y
 CONFIG_MTD_M25P80=y
@@ -152,7 +147,6 @@ CONFIG_WATCHDOG=y
 CONFIG_TEGRA_WATCHDOG=y
 CONFIG_MFD_AS3722=y
 CONFIG_MFD_CROS_EC=y
-CONFIG_MFD_CROS_EC_SPI=y
 CONFIG_MFD_MAX8907=y
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_PALMAS=y
@@ -180,6 +174,7 @@ CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_TEGRA=y
 CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -288,6 +283,10 @@ CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRC_CCITT=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
 CONFIG_MAGIC_SYSRQ=y
@@ -300,5 +299,3 @@ CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRC_CCITT=y
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/3] ARM: tegra: Enable Trusted Foundations by default

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Support for the Trusted Foundations firmware was recently moved outside
of arch/arm and now needs to be selected explicitly. Since some 32-bit
Tegra devices use this firmware, enable support for it in the default
configuration.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/configs/tegra_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 5708e58fe516..8f5c6a5b444c 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -27,6 +27,7 @@ CONFIG_CPUFREQ_DT=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
+CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-- 
2.21.0

[PATCH 2/3] ARM: tegra: Enable Trusted Foundations by default

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Support for the Trusted Foundations firmware was recently moved outside
of arch/arm and now needs to be selected explicitly. Since some 32-bit
Tegra devices use this firmware, enable support for it in the default
configuration.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/configs/tegra_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 5708e58fe516..8f5c6a5b444c 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -27,6 +27,7 @@ CONFIG_CPUFREQ_DT=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
+CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Some 32-bit Tegra devices supported by the multiplatform ARM v7 default
configuration ship with the Trusted Foundations firmware. Enable support
for it by default.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index c75051b9392c..707dff396764 100644
--- 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
-- 
2.21.0

[PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Some 32-bit Tegra devices supported by the multiplatform ARM v7 default
configuration ship with the Trusted Foundations firmware. Enable support
for it by default.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index c75051b9392c..707dff396764 100644
--- 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
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/3] ARM: tegra: Update default configuration for v5.1-rc1

[Dmitry Osipenko]

11.04.2019 12:18, Thierry Reding пишет:
> From: Thierry Reding <treding@nvidia.com>
> 
> Most of the changes here are just symbols that are now enabled by
> default, have been removed, or which have been moved around and now
> appear in a different spot.
> 
> The only notable change here is that BACKLIGHT_CLASS_DEVICE is now
> built-in. This is to allow BACKLIGHT_PWM to be built-in as well.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---

What about to enable the VDE driver module while at it?

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7

[Tony Lindgren]

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")?

I'd like to merge that one in to avoid an unecessary
merge conflict.

Regards,

Tony

Re: [PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7

[Tony Lindgren]

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")?

I'd like to merge that one in to avoid an unecessary
merge conflict.

Regards,

Tony

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7

[Thierry Reding]

[-- 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

Re: [PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7

[Tony Lindgren]

* Thierry Reding <thierry.reding@gmail.com> [190416 07:45]:
> 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?

OK sure, I'll push out a branch against v5.1-rc1 with just the
savedefconfig changes.

Regards,

Tony

Re: [PATCH 3/3] ARM: Enable Trusted Foundations for multiplatform ARM v7

[Tony Lindgren]

* Thierry Reding <thierry.reding@gmail.com> [190416 07:45]:
> 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?

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