All of lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6
@ 2016-02-25 23:51 Simon Horman
  2016-02-25 23:51   ` Simon Horman
  2016-02-29 15:18 ` [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6 Arnd Bergmann
  0 siblings, 2 replies; 5+ messages in thread
From: Simon Horman @ 2016-02-25 23:51 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM64 based SoC defconfig updates for v4.6.

This pull request is based on the previous round of
such requests, tagged as v4.5-rc2,
which I have already sent a pull-request for.

I based this pull request on v4.5-rc2 instead of rc1 to avoid
a minor conflict. However I believe this may have been in vein
as there appears to be a separate minor conflict present in linux-next.

That conflict is with:

efdda175c07f ("arm64: defconfig: add spmi and usb related configs")

The solution is to take both.


The following changes since commit 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3:

  Linux 4.5-rc2 (2016-01-31 18:12:16 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-arm64-defconfig-for-v4.6

for you to fetch changes up to a9c42f02387ce8a231bce7c0901ef15fe4bfc3b4:

  arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support (2016-02-24 09:44:34 +0900)

----------------------------------------------------------------
Renesas ARM64 Based SoC Defconfig Updates for v4.6

* Enable Renesas R-Car Gen3 USB 2.0 phy driver
  which is used on the r8a7795/salvator-x

----------------------------------------------------------------
Yoshihiro Shimoda (1):
      arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support

 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support
  2016-02-25 23:51 [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6 Simon Horman
@ 2016-02-25 23:51   ` Simon Horman
  2016-02-29 15:18 ` [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6 Arnd Bergmann
  1 sibling, 0 replies; 5+ messages in thread
From: Simon Horman @ 2016-02-25 23:51 UTC (permalink / raw)
  To: linux-renesas-soc
  Cc: linux-arm-kernel, Magnus Damm, Yoshihiro Shimoda, Simon Horman

From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 86581f793e39..eaf738a59927 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -213,6 +213,7 @@ CONFIG_QCOM_SMD_RPM=y
 CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_PHY_RCAR_GEN3_USB2=y
 CONFIG_PHY_XGENE=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH] arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support
@ 2016-02-25 23:51   ` Simon Horman
  0 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2016-02-25 23:51 UTC (permalink / raw)
  To: linux-arm-kernel

From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 86581f793e39..eaf738a59927 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -213,6 +213,7 @@ CONFIG_QCOM_SMD_RPM=y
 CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_PHY_RCAR_GEN3_USB2=y
 CONFIG_PHY_XGENE=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6
  2016-02-25 23:51 [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6 Simon Horman
  2016-02-25 23:51   ` Simon Horman
@ 2016-02-29 15:18 ` Arnd Bergmann
  2016-03-01  9:15   ` Simon Horman
  1 sibling, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2016-02-29 15:18 UTC (permalink / raw)
  To: linux-arm-kernel

On Friday 26 February 2016 08:51:45 Simon Horman wrote:
> Please consider these Renesas ARM64 based SoC defconfig updates for v4.6.
> 
> This pull request is based on the previous round of
> such requests, tagged as v4.5-rc2,
> which I have already sent a pull-request for.

It looks like your script generated a funny text here, as you
did not send -rc2 ;-)

> I based this pull request on v4.5-rc2 instead of rc1 to avoid
> a minor conflict. However I believe this may have been in vein
> as there appears to be a separate minor conflict present in linux-next.

Doesn't really matter here, the trivial conflicts are never a
problem, and the branches are already based on -rc3, so you are
not introducing a backmerge.

Pulled into next/arm64, thanks!

	Arnd

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6
  2016-02-29 15:18 ` [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6 Arnd Bergmann
@ 2016-03-01  9:15   ` Simon Horman
  0 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2016-03-01  9:15 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Feb 29, 2016 at 04:18:37PM +0100, Arnd Bergmann wrote:
> On Friday 26 February 2016 08:51:45 Simon Horman wrote:
> > Please consider these Renesas ARM64 based SoC defconfig updates for v4.6.
> > 
> > This pull request is based on the previous round of
> > such requests, tagged as v4.5-rc2,
> > which I have already sent a pull-request for.
> 
> It looks like your script generated a funny text here, as you
> did not send -rc2 ;-)

Oops, I'll have to teach my script to be a bit smarter.

> > I based this pull request on v4.5-rc2 instead of rc1 to avoid
> > a minor conflict. However I believe this may have been in vein
> > as there appears to be a separate minor conflict present in linux-next.
> 
> Doesn't really matter here, the trivial conflicts are never a
> problem, and the branches are already based on -rc3, so you are
> not introducing a backmerge.
> 
> Pulled into next/arm64, thanks!
> 
> 	Arnd

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-03-01  9:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-25 23:51 [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6 Simon Horman
2016-02-25 23:51 ` [PATCH] arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support Simon Horman
2016-02-25 23:51   ` Simon Horman
2016-02-29 15:18 ` [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6 Arnd Bergmann
2016-03-01  9:15   ` Simon Horman

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.