Message ID | 1386196073-25193-1-git-send-email-swarren@wwwdotorg.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Dec 04, 2013 at 03:27:52PM -0700, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > This separates out "NULL" changes from future real changes. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > --- > arch/arm/configs/tegra_defconfig | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) Not sure if this makes sense for what's essentially a machine-generated change, but I've at least verified that this doesn't drop anything unwanted, so: Reviewed-by: Thierry Reding <treding@nvidia.com>
On 12/06/2013 08:22 AM, Thierry Reding wrote: > On Wed, Dec 04, 2013 at 03:27:52PM -0700, Stephen Warren wrote: >> From: Stephen Warren <swarren@nvidia.com> >> >> This separates out "NULL" changes from future real changes. >> >> Signed-off-by: Stephen Warren <swarren@nvidia.com> --- >> arch/arm/configs/tegra_defconfig | 12 ++++-------- 1 file >> changed, 4 insertions(+), 8 deletions(-) > > Not sure if this makes sense for what's essentially a > machine-generated change, but I've at least verified that this > doesn't drop anything unwanted, so: Well, the purpose was to make the real change in patch 2/2 obvious, so it was easier to review. defconfig changes all get squashed back together when applied.
On 12/04/2013 03:27 PM, Stephen Warren wrote:
> This separates out "NULL" changes from future real changes.
I've squashed the series into Tegra's for-3.14/defconfig branch.
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 4934295bb4f0..4a293393f415 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -36,8 +36,8 @@ CONFIG_PCIEPORTBUS=y CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set CONFIG_HIGHMEM=y +CONFIG_CMA=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_KEXEC=y @@ -63,7 +63,6 @@ CONFIG_INET_ESP=y # CONFIG_INET_LRO is not set # CONFIG_INET_DIAG is not set CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=y @@ -85,7 +84,6 @@ CONFIG_RFKILL_GPIO=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_CMA=y CONFIG_DMA_CMA=y CONFIG_MTD=y CONFIG_MTD_M25P80=y @@ -164,7 +162,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m CONFIG_DRM=y -CONFIG_TEGRA_HOST1X=y CONFIG_DRM_TEGRA=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set @@ -256,16 +253,15 @@ CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_INFO=y CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y +CONFIG_DEBUG_SLAB=y +CONFIG_DEBUG_VM=y CONFIG_DETECT_HUNG_TASK=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y -CONFIG_DEBUG_SLAB=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_VM=y CONFIG_DEBUG_SG=y CONFIG_DEBUG_LL=y CONFIG_EARLY_PRINTK=y