From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Kumar Gala <galak@codeaurora.org>,
linux-next@vger.kernel.org, Will Deacon <will.deacon@arm.com>,
linux-kernel@vger.kernel.org,
Abhimanyu Kapur <abhimany@codeaurora.org>
Subject: Re: linux-next: manual merge of the arm64 tree with the arm-soc tree
Date: Tue, 7 Apr 2015 10:13:26 +0100 [thread overview]
Message-ID: <20150407091325.GA32558@localhost> (raw)
In-Reply-To: <20150407114600.14a3ecc8@canb.auug.org.au>
Hi Stephen,
On Tue, Apr 07, 2015 at 11:46:00AM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/configs/defconfig
> index 96bba367f80c,e07896c819ef..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -31,10 -31,12 +31,14 @@@ CONFIG_MODULES=
> CONFIG_MODULE_UNLOAD=y
> # CONFIG_BLK_DEV_BSG is not set
> # CONFIG_IOSCHED_DEADLINE is not set
> + CONFIG_ARCH_EXYNOS7=y
> CONFIG_ARCH_FSL_LS2085A=y
> CONFIG_ARCH_MEDIATEK=y
> +CONFIG_ARCH_QCOM=y
> +CONFIG_ARCH_SPRD=y
> + CONFIG_ARCH_SEATTLE=y
> + CONFIG_ARCH_TEGRA=y
> + CONFIG_ARCH_TEGRA_132_SOC=y
> CONFIG_ARCH_THUNDER=y
> CONFIG_ARCH_VEXPRESS=y
> CONFIG_ARCH_XGENE=y
> @@@ -105,9 -104,10 +111,11 @@@ CONFIG_VIRTIO_CONSOLE=
> # CONFIG_HW_RANDOM is not set
> CONFIG_SPI=y
> CONFIG_SPI_PL022=y
> +CONFIG_PINCTRL_MSM8916=y
> CONFIG_GPIO_PL061=y
> CONFIG_GPIO_XGENE=y
> + CONFIG_POWER_RESET_XGENE=y
> + CONFIG_POWER_RESET_SYSCON=y
> # CONFIG_HWMON is not set
> CONFIG_REGULATOR=y
> CONFIG_REGULATOR_FIXED_VOLTAGE=y
> @@@ -133,10 -133,9 +141,11 @@@ CONFIG_MMC_SPI=
> CONFIG_RTC_CLASS=y
> CONFIG_RTC_DRV_EFI=y
> CONFIG_RTC_DRV_XGENE=y
> + CONFIG_VIRTIO_PCI=y
> CONFIG_VIRTIO_BALLOON=y
> CONFIG_VIRTIO_MMIO=y
> +CONFIG_COMMON_CLK_QCOM=y
> +CONFIG_MSM_GCC_8916=y
> # CONFIG_IOMMU_SUPPORT is not set
> CONFIG_PHY_XGENE=y
> CONFIG_EXT2_FS=y
It looks fine. Thanks.
--
Catalin
WARNING: multiple messages have this Message-ID (diff)
From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm64 tree with the arm-soc tree
Date: Tue, 7 Apr 2015 10:13:26 +0100 [thread overview]
Message-ID: <20150407091325.GA32558@localhost> (raw)
In-Reply-To: <20150407114600.14a3ecc8@canb.auug.org.au>
Hi Stephen,
On Tue, Apr 07, 2015 at 11:46:00AM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/configs/defconfig
> index 96bba367f80c,e07896c819ef..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -31,10 -31,12 +31,14 @@@ CONFIG_MODULES=
> CONFIG_MODULE_UNLOAD=y
> # CONFIG_BLK_DEV_BSG is not set
> # CONFIG_IOSCHED_DEADLINE is not set
> + CONFIG_ARCH_EXYNOS7=y
> CONFIG_ARCH_FSL_LS2085A=y
> CONFIG_ARCH_MEDIATEK=y
> +CONFIG_ARCH_QCOM=y
> +CONFIG_ARCH_SPRD=y
> + CONFIG_ARCH_SEATTLE=y
> + CONFIG_ARCH_TEGRA=y
> + CONFIG_ARCH_TEGRA_132_SOC=y
> CONFIG_ARCH_THUNDER=y
> CONFIG_ARCH_VEXPRESS=y
> CONFIG_ARCH_XGENE=y
> @@@ -105,9 -104,10 +111,11 @@@ CONFIG_VIRTIO_CONSOLE=
> # CONFIG_HW_RANDOM is not set
> CONFIG_SPI=y
> CONFIG_SPI_PL022=y
> +CONFIG_PINCTRL_MSM8916=y
> CONFIG_GPIO_PL061=y
> CONFIG_GPIO_XGENE=y
> + CONFIG_POWER_RESET_XGENE=y
> + CONFIG_POWER_RESET_SYSCON=y
> # CONFIG_HWMON is not set
> CONFIG_REGULATOR=y
> CONFIG_REGULATOR_FIXED_VOLTAGE=y
> @@@ -133,10 -133,9 +141,11 @@@ CONFIG_MMC_SPI=
> CONFIG_RTC_CLASS=y
> CONFIG_RTC_DRV_EFI=y
> CONFIG_RTC_DRV_XGENE=y
> + CONFIG_VIRTIO_PCI=y
> CONFIG_VIRTIO_BALLOON=y
> CONFIG_VIRTIO_MMIO=y
> +CONFIG_COMMON_CLK_QCOM=y
> +CONFIG_MSM_GCC_8916=y
> # CONFIG_IOMMU_SUPPORT is not set
> CONFIG_PHY_XGENE=y
> CONFIG_EXT2_FS=y
It looks fine. Thanks.
--
Catalin
next prev parent reply other threads:[~2015-04-07 9:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-07 1:46 linux-next: manual merge of the arm64 tree with the arm-soc tree Stephen Rothwell
2015-04-07 1:46 ` Stephen Rothwell
2015-04-07 1:46 ` Stephen Rothwell
2015-04-07 9:13 ` Catalin Marinas [this message]
2015-04-07 9:13 ` Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2016-02-28 23:51 Stephen Rothwell
2016-02-28 23:51 ` Stephen Rothwell
2016-02-28 23:51 ` Stephen Rothwell
2015-03-30 23:21 Stephen Rothwell
2015-03-30 23:21 ` Stephen Rothwell
2015-03-30 23:21 ` Stephen Rothwell
2015-03-31 14:04 ` Catalin Marinas
2015-03-31 14:04 ` Catalin Marinas
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=20150407091325.GA32558@localhost \
--to=catalin.marinas@arm.com \
--cc=abhimany@codeaurora.org \
--cc=arnd@arndb.de \
--cc=galak@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=will.deacon@arm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.