Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Leo Li <leoyang.li@nxp.com>
To:     Shawn Guo <shawnguo@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
        Olof Johansson <olof@lixom.net>
CC:     "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 1/2] arm64: defconfig: run through savedefconfig for
 ordering
Thread-Topic: [PATCH 1/2] arm64: defconfig: run through savedefconfig for
 ordering
Thread-Index: AQHV4HYQkBp5gNwa3EW+6CF+jjRMxage5usAgAJPBQA=
Date:   Tue, 18 Feb 2020 16:54:05 +0000
Message-ID: <VE1PR04MB6687EFB8CC40D9A53E8D25008F110@VE1PR04MB6687.eurprd04.prod.outlook.com>
References: <1581382559-18520-1-git-send-email-leoyang.li@nxp.com>
 <20200217053427.GA6042@dragon>
In-Reply-To: <20200217053427.GA6042@dragon>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: nxp.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: e50be303-3f19-48e2-cc87-08d7b4932a6d
X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Feb 2020 16:54:05.9936
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: Zf57IO5YRY+NuEyrmFrmMFpn9aWney9KNd04SjkvhWoEo9Vik3WcSvbIyAHF9/1z+ir6/xa8Sb6KiYaqJ56FZg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6656
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Shawn Guo <shawnguo@kernel.org>
> Sent: Sunday, February 16, 2020 11:34 PM
> To: Leo Li <leoyang.li@nxp.com>; Arnd Bergmann <arnd@arndb.de>; Olof
> Johansson <olof@lixom.net>
> Cc: linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH 1/2] arm64: defconfig: run through savedefconfig for
> ordering
>=20
> On Mon, Feb 10, 2020 at 06:55:58PM -0600, Li Yang wrote:
> > Used "make defconfig savedefconfig" to regenerate defconfig file in the
> > right order to prepare for additional defconfig changes.
> >
> > Signed-off-by: Li Yang <leoyang.li@nxp.com>
>=20
> Arnd, Olof,
>=20
> How do we handle arm64 defconfig savedefconfig changes? I think it will
> likely cause conflicts with changes from other platform maintainers.

Actually I think it helps a lot for managing off-tree defconfig patches whe=
n we keep it sorted with savedefconfig because changes to the same option w=
ill always be at the same location and shown as proper conflicts when mergi=
ng.

Regards,
Leo
>=20
> Shawn
>=20
> > ---
> >  arch/arm64/configs/defconfig | 15 ++++++---------
> >  1 file changed, 6 insertions(+), 9 deletions(-)
> >
> > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfi=
g
> > index 0f212889c931..618001ef5c81 100644
> > --- a/arch/arm64/configs/defconfig
> > +++ b/arch/arm64/configs/defconfig
> > @@ -471,9 +471,9 @@ CONFIG_DW_WATCHDOG=3Dy
> >  CONFIG_SUNXI_WATCHDOG=3Dm
> >  CONFIG_IMX2_WDT=3Dy
> >  CONFIG_IMX_SC_WDT=3Dm
> > +CONFIG_QCOM_WDT=3Dm
> >  CONFIG_MESON_GXBB_WATCHDOG=3Dm
> >  CONFIG_MESON_WATCHDOG=3Dm
> > -CONFIG_QCOM_WDT=3Dm
> >  CONFIG_RENESAS_WDT=3Dy
> >  CONFIG_UNIPHIER_WATCHDOG=3Dy
> >  CONFIG_BCM2835_WDT=3Dy
> > @@ -594,8 +594,8 @@ CONFIG_SND_SOC_TAS571X=3Dm
> >  CONFIG_SND_SIMPLE_CARD=3Dm
> >  CONFIG_SND_AUDIO_GRAPH_CARD=3Dm
> >  CONFIG_I2C_HID=3Dm
> > -CONFIG_USB=3Dy
> >  CONFIG_USB_CONN_GPIO=3Dm
> > +CONFIG_USB=3Dy
> >  CONFIG_USB_OTG=3Dy
> >  CONFIG_USB_XHCI_HCD=3Dy
> >  CONFIG_USB_XHCI_TEGRA=3Dy
> > @@ -617,7 +617,6 @@ CONFIG_USB_CHIPIDEA_HOST=3Dy
> >  CONFIG_USB_ISP1760=3Dy
> >  CONFIG_USB_HSIC_USB3503=3Dy
> >  CONFIG_NOP_USB_XCEIV=3Dy
> > -CONFIG_USB_ULPI=3Dy
> >  CONFIG_USB_GADGET=3Dy
> >  CONFIG_USB_RENESAS_USBHS_UDC=3Dm
> >  CONFIG_USB_RENESAS_USB3=3Dm
> > @@ -756,7 +755,6 @@ CONFIG_OWL_PM_DOMAINS=3Dy
> >  CONFIG_RASPBERRYPI_POWER=3Dy
> >  CONFIG_IMX_SCU_SOC=3Dy
> >  CONFIG_QCOM_AOSS_QMP=3Dy
> > -CONFIG_QCOM_COMMAND_DB=3Dy
> >  CONFIG_QCOM_GENI_SE=3Dy
> >  CONFIG_QCOM_GLINK_SSR=3Dm
> >  CONFIG_QCOM_RMTFS_MEM=3Dm
> > @@ -771,14 +769,12 @@ CONFIG_ARCH_R8A774A1=3Dy
> >  CONFIG_ARCH_R8A774B1=3Dy
> >  CONFIG_ARCH_R8A774C0=3Dy
> >  CONFIG_ARCH_R8A7795=3Dy
> > -CONFIG_ARCH_R8A7796=3Dy
> >  CONFIG_ARCH_R8A77961=3Dy
> >  CONFIG_ARCH_R8A77965=3Dy
> >  CONFIG_ARCH_R8A77970=3Dy
> >  CONFIG_ARCH_R8A77980=3Dy
> >  CONFIG_ARCH_R8A77990=3Dy
> >  CONFIG_ARCH_R8A77995=3Dy
> > -CONFIG_QCOM_PDC=3Dy
> >  CONFIG_ROCKCHIP_PM_DOMAINS=3Dy
> >  CONFIG_ARCH_TEGRA_132_SOC=3Dy
> >  CONFIG_ARCH_TEGRA_210_SOC=3Dy
> > @@ -809,6 +805,7 @@ CONFIG_PWM_ROCKCHIP=3Dy
> >  CONFIG_PWM_SAMSUNG=3Dy
> >  CONFIG_PWM_SUN4I=3Dm
> >  CONFIG_PWM_TEGRA=3Dm
> > +CONFIG_QCOM_PDC=3Dy
> >  CONFIG_RESET_QCOM_AOSS=3Dy
> >  CONFIG_RESET_QCOM_PDC=3Dm
> >  CONFIG_RESET_TI_SCI=3Dy
> > @@ -880,16 +877,16 @@ CONFIG_NLS_ISO8859_1=3Dy
> >  CONFIG_SECURITY=3Dy
> >  CONFIG_CRYPTO_ECHAINIV=3Dy
> >  CONFIG_CRYPTO_ANSI_CPRNG=3Dy
> > +CONFIG_CRYPTO_USER_API_RNG=3Dm
> >  CONFIG_CRYPTO_DEV_SUN8I_CE=3Dm
> >  CONFIG_CRYPTO_DEV_FSL_CAAM=3Dm
> > -CONFIG_CRYPTO_DEV_HISI_ZIP=3Dm
> > -CONFIG_CRYPTO_USER_API_RNG=3Dm
> >  CONFIG_CRYPTO_DEV_QCOM_RNG=3Dm
> > +CONFIG_CRYPTO_DEV_HISI_ZIP=3Dm
> >  CONFIG_CMA_SIZE_MBYTES=3D32
> >  CONFIG_PRINTK_TIME=3Dy
> >  CONFIG_DEBUG_INFO=3Dy
> > -CONFIG_DEBUG_FS=3Dy
> >  CONFIG_MAGIC_SYSRQ=3Dy
> > +CONFIG_DEBUG_FS=3Dy
> >  CONFIG_DEBUG_KERNEL=3Dy
> >  # CONFIG_SCHED_DEBUG is not set
> >  # CONFIG_DEBUG_PREEMPT is not set
> > --
> > 2.17.1
> >