[git pull] Please pull powerpc.git merge branch

4 messages, 2 authors, 2010-05-13 · open the first message on its own page

[git pull] Please pull powerpc.git merge branch

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2010-05-12 07:55:19

Hi Linus !

Please pull this perf event fix from Paulus. Without it, using perf event
can potentially oops the machine at any time.

Thanks !

Cheers,
Ben.

The following changes since commit cea0d767c29669bf89f86e4aee46ef462d2ebae8:
  Linus Torvalds (1):
        Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Paul Mackerras (1):
      powerpc/perf_event: Fix oops due to perf_event_do_pending call

 arch/powerpc/include/asm/hw_irq.h |   38 -----------------------
 arch/powerpc/kernel/asm-offsets.c |    1 -
 arch/powerpc/kernel/entry_64.S    |    9 -----
 arch/powerpc/kernel/irq.c         |    6 ----
 arch/powerpc/kernel/time.c        |   60 +++++++++++++++++++++++++++++-------
 5 files changed, 48 insertions(+), 66 deletions(-)

Re: [git pull] Please pull powerpc.git merge branch

From: Kumar Gala <hidden>
Date: 2010-05-12 10:24:20

On May 12, 2010, at 2:46 AM, Benjamin Herrenschmidt wrote:
Hi Linus !
=20
Please pull this perf event fix from Paulus. Without it, using perf =
event
can potentially oops the machine at any time.
=20
Thanks !
=20
Cheers,
Ben.
=20
The following changes since commit =
cea0d767c29669bf89f86e4aee46ef462d2ebae8:
 Linus Torvalds (1):
       Merge branch 'hwmon-for-linus' of =
git://git.kernel.org/.../jdelvare/staging
=20
are available in the git repository at:
=20
 git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
=20
Paul Mackerras (1):
     powerpc/perf_event: Fix oops due to perf_event_do_pending call
=20
arch/powerpc/include/asm/hw_irq.h |   38 -----------------------
arch/powerpc/kernel/asm-offsets.c |    1 -
arch/powerpc/kernel/entry_64.S    |    9 -----
arch/powerpc/kernel/irq.c         |    6 ----
arch/powerpc/kernel/time.c        |   60 =
+++++++++++++++++++++++++++++-------
5 files changed, 48 insertions(+), 66 deletions(-)
=20
Ben,

Did where you going to also send linus:

http://patchwork.ozlabs.org/patch/51496/

- k=

Re: [git pull] Please pull powerpc.git merge branch

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2010-05-12 10:37:07

On Wed, 2010-05-12 at 05:24 -0500, Kumar Gala wrote:
Did where you going to also send linus:

http://patchwork.ozlabs.org/patch/51496/
Forgot about that one... I'll add it to the pile tomorrow.

Cheers,
Ben.

[git pull] Please pull powerpc.git merge branch

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2010-05-13 01:46:34

Hi Linus !

I've added to my merge branch Kumar's swiotlb fix. Here's the updated
pull request.

Thanks !

Cheers,
Ben.

The following changes since commit cea0d767c29669bf89f86e4aee46ef462d2ebae8:
  Linus Torvalds (1):
        Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Benjamin Herrenschmidt (1):
      Merge commit 'kumar/merge' into merge

Kumar Gala (1):
      powerpc/swiotlb: Fix off by one in determining boundary of which ops to use

Paul Mackerras (1):
      powerpc/perf_event: Fix oops due to perf_event_do_pending call

 arch/powerpc/include/asm/hw_irq.h |   38 -----------------------
 arch/powerpc/kernel/asm-offsets.c |    1 -
 arch/powerpc/kernel/dma-swiotlb.c |    5 ++-
 arch/powerpc/kernel/entry_64.S    |    9 -----
 arch/powerpc/kernel/irq.c         |    6 ----
 arch/powerpc/kernel/time.c        |   60 +++++++++++++++++++++++++++++-------
 6 files changed, 51 insertions(+), 68 deletions(-)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help