mbox

[GIT,PULL] Samsung Fixes for v3.1-rc7

Message ID 00b101cc738d$bcf46ce0$36dd46a0$%kim@samsung.com
State New
Headers show

Pull-request

git://github.com/kgene/linux-samsung.git samsung-fixes-2

Message

Kukjin Kim Sept. 15, 2011, 9:56 a.m. UTC
Hi Arnd :)

This is Samsung fixes for v3.1

Please pull from:
  git://github.com/kgene/linux-samsung.git samsung-fixes-2
As you know, git.kernel.org/master.kernel.org has been down so I use
temporary git repo. at github now.

These things are needed for v3.1 and if any problems, please let me know.

As a note, others for v3.2 will be sent in the next week...

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

The following changes since commit b6fd41e29dea9c6753b1843a77e50433e6123bcb:

  Linux 3.1-rc6 (2011-09-12 14:02:02 -0700)

are available in the git repository at:
  git://github.com/kgene/linux-samsung.git samsung-fixes-2

Banajit Goswami (1):
      ARM: S3C64XX: Remove un-used code backlight code on SMDK6410

Changhwan Youn (1):
      ARM: EXYNOS4: restart clocksource while system resumes

Jonghwan Choi (1):
      ARM: EXYNOS4: Fix wrong pll type for vpll

Kukjin Kim (3):
      ARM: EXYNOS4: Fix return type of local_timer_setup()
      ARM: EXYNOS4: Fix routing timer interrupt to offline CPU
      ARM: SAMSUNG: fix to prevent declaring duplicated

Marek Szyprowski (1):
      ARM: SAMSUNG: fix watchdog reset issue with clk_get()

Thomas Abraham (1):
      ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines

 arch/arm/mach-exynos4/clock.c                      |    2 +-
 arch/arm/mach-exynos4/mct.c                        |   10 +++++-
 arch/arm/mach-exynos4/platsmp.c                    |    2 +
 arch/arm/mach-exynos4/setup-keypad.c               |   11 +++---
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |   39
--------------------
 arch/arm/plat-samsung/clock.c                      |   11 ++++++
 arch/arm/plat-samsung/include/plat/clock.h         |    8 ++++
 .../arm/plat-samsung/include/plat/watchdog-reset.h |   10 ++----
 8 files changed, 40 insertions(+), 53 deletions(-)

Comments

Arnd Bergmann Sept. 15, 2011, 3:32 p.m. UTC | #1
On Thursday 15 September 2011, Kukjin Kim wrote:
> This is Samsung fixes for v3.1
> 
> Please pull from:
>   git://github.com/kgene/linux-samsung.git samsung-fixes-2
> As you know, git.kernel.org/master.kernel.org has been down so I use
> temporary git repo. at github now.
> 
> These things are needed for v3.1 and if any problems, please let me know.
> 
> As a note, others for v3.2 will be sent in the next week...

Thanks, pulled.

Is it correct that you want none of these patches to be backported
into the stable or longterm releases? Some of these look like they
should be marked 'Cc: stable@kernel.org'.

	Arnd
Kukjin Kim Sept. 16, 2011, 11:50 a.m. UTC | #2
Arnd Bergmann wrote:
> 
> On Thursday 15 September 2011, Kukjin Kim wrote:
> > This is Samsung fixes for v3.1
> >
> > Please pull from:
> >   git://github.com/kgene/linux-samsung.git samsung-fixes-2
> > As you know, git.kernel.org/master.kernel.org has been down so I use
> > temporary git repo. at github now.
> >
> > These things are needed for v3.1 and if any problems, please let me
know.
> >
> > As a note, others for v3.2 will be sent in the next week...
> 
> Thanks, pulled.
> 
> Is it correct that you want none of these patches to be backported
> into the stable or longterm releases? Some of these look like they
> should be marked 'Cc: stable@kernel.org'.
> 
(Cc'ed Greg K-H)

Yes, you're right. Some patches are needed to sent to stable@kernel.org.
But unfortunately, when they have been submitted, there was no 'Cc:
stable@kernel.org'...

In this case, I'm not sure which following method is proper...
- to send 'pull request' to Greg / stable@kernel.org like bug fix during -rc
- to submit each patches with adding 'Cc: stable@kernel.org' again
- or ?

Please kindly let me know.
Thanks, have a nice weekend.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
gregkh@suse.de Sept. 16, 2011, 1:43 p.m. UTC | #3
On Fri, Sep 16, 2011 at 08:50:51PM +0900, Kukjin Kim wrote:
> Arnd Bergmann wrote:
> > 
> > On Thursday 15 September 2011, Kukjin Kim wrote:
> > > This is Samsung fixes for v3.1
> > >
> > > Please pull from:
> > >   git://github.com/kgene/linux-samsung.git samsung-fixes-2
> > > As you know, git.kernel.org/master.kernel.org has been down so I use
> > > temporary git repo. at github now.
> > >
> > > These things are needed for v3.1 and if any problems, please let me
> know.
> > >
> > > As a note, others for v3.2 will be sent in the next week...
> > 
> > Thanks, pulled.
> > 
> > Is it correct that you want none of these patches to be backported
> > into the stable or longterm releases? Some of these look like they
> > should be marked 'Cc: stable@kernel.org'.
> > 
> (Cc'ed Greg K-H)
> 
> Yes, you're right. Some patches are needed to sent to stable@kernel.org.
> But unfortunately, when they have been submitted, there was no 'Cc:
> stable@kernel.org'...

What do you mean?  Do you mean you just forgot to add them, or you
created them so long ago before there was a stable@kernel.org?

> In this case, I'm not sure which following method is proper...
> - to send 'pull request' to Greg / stable@kernel.org like bug fix during -rc
> - to submit each patches with adding 'Cc: stable@kernel.org' again
> - or ?

Are these in Linus's tree already?  If so, send me the git commit ids
and I will add them to the stable kernels.

If not, wait until they are, and then send me the git commit ids, and I
will then add them.

Before they get to Linus, there's nothing I can do with them, and I
don't accept pull requests as that makes no sense when it comes to the
stable kernel patch flow.

Does this help?

greg k-h
Arnd Bergmann Sept. 16, 2011, 4:34 p.m. UTC | #4
On Friday 16 September 2011 15:43:00 Greg KH wrote:
> > In this case, I'm not sure which following method is proper...
> > - to send 'pull request' to Greg / stable@kernel.org like bug fix during -rc
> > - to submit each patches with adding 'Cc: stable@kernel.org' again
> > - or ?

The patches are currently queued in the stable branch of the arm-soc
tree, I haven't forwarded them to Linus yet. I can easily change
the changelog before I actually send them on (if you tell me which ones
they are, or I can pull an updated set of patches to replace them.

> Are these in Linus's tree already?  If so, send me the git commit ids
> and I will add them to the stable kernels.
> 
> If not, wait until they are, and then send me the git commit ids, and I
> will then add them.

This is fine with me as well, but I'm trying to get more people to
send me patches that are annotated already. I forgot to ask during
the last set of bug fixes I forwarded and should probably go through
the ones that are already merged and ask the authors about backporting.

	Arnd
Kukjin Kim Sept. 17, 2011, 1:02 a.m. UTC | #5
Greg KH wrote:
> 
> On Fri, Sep 16, 2011 at 08:50:51PM +0900, Kukjin Kim wrote:
> > Arnd Bergmann wrote:
> > >
> > > On Thursday 15 September 2011, Kukjin Kim wrote:
> > > > This is Samsung fixes for v3.1
> > > >
> > > > Please pull from:
> > > >   git://github.com/kgene/linux-samsung.git samsung-fixes-2
> > > > As you know, git.kernel.org/master.kernel.org has been down so I use
> > > > temporary git repo. at github now.
> > > >
> > > > These things are needed for v3.1 and if any problems, please let me
> > know.
> > > >
> > > > As a note, others for v3.2 will be sent in the next week...
> > >
> > > Thanks, pulled.
> > >
> > > Is it correct that you want none of these patches to be backported
> > > into the stable or longterm releases? Some of these look like they
> > > should be marked 'Cc: stable@kernel.org'.
> > >
> > (Cc'ed Greg K-H)
> >
> > Yes, you're right. Some patches are needed to sent to stable@kernel.org.
> > But unfortunately, when they have been submitted, there was no 'Cc:
> > stable@kernel.org'...
> 
> What do you mean?  Do you mean you just forgot to add them, or you
> created them so long ago before there was a stable@kernel.org?
> 
I mean I didn't add them before sending 'pull request' during -rc :(

> > In this case, I'm not sure which following method is proper...
> > - to send 'pull request' to Greg / stable@kernel.org like bug fix during
-rc
> > - to submit each patches with adding 'Cc: stable@kernel.org' again
> > - or ?
> 
> Are these in Linus's tree already?  If so, send me the git commit ids
> and I will add them to the stable kernels.
> 
In this case, not yet. But there are some bug fixing patches which have been
accepted in mainline not in stable.

> If not, wait until they are, and then send me the git commit ids, and I
> will then add them.
> 
OK, let you know what git commit is needed to apply into stable.

> Before they get to Linus, there's nothing I can do with them, and I
> don't accept pull requests as that makes no sense when it comes to the
> stable kernel patch flow.
> 
OK, I didn't know about the stable kernel patch flow exactly.

> Does this help?
> 
Sure, thank you so much.
Have a nice weekend :)

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Kukjin Kim Sept. 17, 2011, 1:08 a.m. UTC | #6
Arnd Bergmann wrote:
> 
> On Friday 16 September 2011 15:43:00 Greg KH wrote:
> > > In this case, I'm not sure which following method is proper...
> > > - to send 'pull request' to Greg / stable@kernel.org like bug fix
during -rc
> > > - to submit each patches with adding 'Cc: stable@kernel.org' again
> > > - or ?
> 
> The patches are currently queued in the stable branch of the arm-soc
> tree, I haven't forwarded them to Linus yet. I can easily change
> the changelog before I actually send them on (if you tell me which ones
> they are, or I can pull an updated set of patches to replace them.
> 
Arnd, I think, would be better to me if you could not change the
changelog(commit id) because some my topic branch which is for v3.2 has it.

> > Are these in Linus's tree already?  If so, send me the git commit ids
> > and I will add them to the stable kernels.
> >
> > If not, wait until they are, and then send me the git commit ids, and I
> > will then add them.
> 
> This is fine with me as well, but I'm trying to get more people to
> send me patches that are annotated already. I forgot to ask during
> the last set of bug fixes I forwarded and should probably go through
> the ones that are already merged and ask the authors about backporting.
> 
I need to sort out commit ids which are needed to apply in stable among
Samsung stuff already in mainline.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Arnd Bergmann Sept. 17, 2011, 8:47 a.m. UTC | #7
On Saturday 17 September 2011 10:08:30 Kukjin Kim wrote:
> Arnd Bergmann wrote:
?
> > 
> > The patches are currently queued in the stable branch of the arm-soc
> > tree, I haven't forwarded them to Linus yet. I can easily change
> > the changelog before I actually send them on (if you tell me which ones
> > they are, or I can pull an updated set of patches to replace them.
> > 
> Arnd, I think, would be better to me if you could not change the
> changelog(commit id) because some my topic branch which is for v3.2 has it.

Ok, no problem.

	Arnd