mbox

[GIT,PULL] Samsung 1st fixes for v4.2

Message ID 55ADBF14.30304@kernel.org
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git

Message

'Kukjin Kim' July 21, 2015, 3:40 a.m. UTC
Hi,

Please pull samsung fixes for v4.2.

Thanks,
Kukjin

The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:

  Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/samsung-fixes-1

for you to fetch changes up to 300bde79f3d86b1af6fcde7b7b2439ecffccbff4:

  ARM: dts: add CPU OPP and regulator supply property for exynos4210
(2015-07-21 12:32:29 +0900)

----------------------------------------------------------------
Samsung fixes for v4.2

>From Krzysztof Kozlowski:
1. Fix exynos3250 MIPI DSI display and MIPI CSIS-2 camera sensorx
   after adding support for PMU regmap in exynos-video-mipi driver
   (issue introduced in v4.0).
2. Bring back cpufreq for exynos4210 after incomplete switch to
   cpufreq-dt driver in 4.2 merge window. The necessary DT changes
   for exynos4210 cpufreq was not applied to the same tree as rest
   of patchset because of multiple conflicts between clk and arm-soc
   trees. Unfortunately without the change the exynos4210 boards
   loose cpufreq feature.

----------------------------------------------------------------
Beata Michalska (1):
      ARM: dts: Update video-phy node with syscon phandle for exynos3250

Thomas Abraham (1):
      ARM: dts: add CPU OPP and regulator supply property for exynos4210

 arch/arm/boot/dts/exynos3250.dtsi               |  2 +-
 arch/arm/boot/dts/exynos4210-origen.dts         |  4 ++++
 arch/arm/boot/dts/exynos4210-trats.dts          |  4 ++++
 arch/arm/boot/dts/exynos4210-universal_c210.dts |  4 ++++
 arch/arm/boot/dts/exynos4210.dtsi               | 12 ++++++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)

Comments

Olof Johansson July 21, 2015, 9:05 p.m. UTC | #1
Hi Kukjin,

On Tue, Jul 21, 2015 at 12:40:04PM +0900, Kukjin Kim wrote:
> Hi,
> 
> Please pull samsung fixes for v4.2.
> 
> Thanks,
> Kukjin
> 
> The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:
> 
>   Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> tags/samsung-fixes-1
> 
> for you to fetch changes up to 300bde79f3d86b1af6fcde7b7b2439ecffccbff4:
> 
>   ARM: dts: add CPU OPP and regulator supply property for exynos4210
> (2015-07-21 12:32:29 +0900)

Was there a reason you rebased Krzystztof's branch? The contents is identical.

In cases like those, feel free to just forward the pull request to us
and we can do it directly. If you have more patches you want to add into
the same fixes branch then you can just merge his in and apply yours on
top. That's for example how Tony Lindgren tends to handle OMAP -- he'll
forward a pull request from Paul Walmsley if that's the only contents
he has.

Anyway, merged.


-Olof
'Kukjin Kim' July 23, 2015, 8:15 a.m. UTC | #2
Olof Johansson wrote:
> 
> Hi Kukjin,
> 
Hi Olof,

> On Tue, Jul 21, 2015 at 12:40:04PM +0900, Kukjin Kim wrote:
> > Hi,
> >
> > Please pull samsung fixes for v4.2.
> >
> > Thanks,
> > Kukjin
> >
> > The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:
> >
> >   Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)
> >
> > are available in the git repository at:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> > tags/samsung-fixes-1
> >
> > for you to fetch changes up to 300bde79f3d86b1af6fcde7b7b2439ecffccbff4:
> >
> >   ARM: dts: add CPU OPP and regulator supply property for exynos4210
> > (2015-07-21 12:32:29 +0900)
> 
> Was there a reason you rebased Krzystztof's branch? The contents is identical.
> 
> In cases like those, feel free to just forward the pull request to us
> and we can do it directly. If you have more patches you want to add into
> the same fixes branch then you can just merge his in and apply yours on
> top. That's for example how Tony Lindgren tends to handle OMAP -- he'll
> forward a pull request from Paul Walmsley if that's the only contents
> he has.
> 
Yeah, I know what you're saying and I agreed. Actually the OMAP model would be
helpful. BTW in this case, I wanted to change the subject title that's why I
did cherry-pick.

> Anyway, merged.
> 
Thanks,
Kukjin