Patchwork [git,pull] Please pull powerpc.git merge branch

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date Jan. 28, 2013, 11:42 p.m.
Message ID <1359416520.18955.12.camel@pasglop>
Download mbox
Permalink /patch/216401/
State Not Applicable
Headers show

Pull-request

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

Comments

Benjamin Herrenschmidt - Jan. 28, 2013, 11:42 p.m.
Hi Linus !

Whenever you have a chance between two dives, you might want to consider
pulling my merge branch to pickup a few fixes for 3.8 that have been
accumulating for the last couple of weeks (I was myself travelling
then on vacation). Nothing major, just a handful of powerpc bug fixes
that I consider worth getting in before 3.8 goes final.

Cheers,
Ben.

The following changes since commit 45e72af09faa7dad5d8539ebac0fe317ae88318b:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes (2013-01-28 11:53:49 -0800)

are available in the git repository at:


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

for you to fetch changes up to 689dfa894c57842a05bf6dc9f97e6bb71ec5f386:

  powerpc: Max next_tb to prevent from replaying timer interrupt (2013-01-29 10:18:16 +1100)

----------------------------------------------------------------
Carl E. Love (1):
      powerpc/oprofile: Fix error in oprofile power7_marked_instr_event() function

Cong Ding (1):
      powerpc: kernel/kgdb.c: Fix memory leakage

Li Zhong (1):
      powerpc: Fix MAX_STACK_TRACE_ENTRIES too low warning for ppc32

Steven Rostedt (1):
      powerpc/pasemi: Fix crash on reboot

Tiejun Chen (2):
      powerpc/book3e: Disable interrupt after preempt_schedule_irq
      powerpc: Max next_tb to prevent from replaying timer interrupt

 arch/powerpc/kernel/entry_32.S          |    2 ++
 arch/powerpc/kernel/entry_64.S          |   13 +++++++++++++
 arch/powerpc/kernel/kgdb.c              |    5 +++--
 arch/powerpc/kernel/time.c              |    9 +++++++--
 arch/powerpc/oprofile/op_model_power4.c |    2 +-
 arch/powerpc/platforms/pasemi/cpufreq.c |    7 +++++++
 6 files changed, 33 insertions(+), 5 deletions(-)
Linus Torvalds - Jan. 29, 2013, 12:03 a.m.
On Mon, Jan 28, 2013 at 3:42 PM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> Whenever you have a chance between two dives, you might want to consider
> pulling my merge branch to pickup a few fixes for 3.8 that have been
> accumulating for the last couple of weeks (I was myself travelling
> then on vacation).

I'll have you know that I haven't quite even left for Au yet, and I
have LCA before diving. So no snarky "in between dives" comments,
please.

At least not for a few days.

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

Nothing there. Forgot to push? Or some unnamed branch/tag?

(And I _am_ leaving for the airport soon, so I may not get to it for a
while unless you reply asap)

          Linus
Benjamin Herrenschmidt - Jan. 29, 2013, 12:09 a.m.
On Mon, 2013-01-28 at 16:03 -0800, Linus Torvalds wrote:
> I'll have you know that I haven't quite even left for Au yet, and I
> have LCA before diving. So no snarky "in between dives" comments,
> please.

It wasn't meant to be "snarky", sorry about that...

> At least not for a few days.
> 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
> 
> Nothing there. Forgot to push? Or some unnamed branch/tag?

My usual problem with git request-pull when the mirror haven't caught up
yet. Branch is "merge".

> (And I _am_ leaving for the airport soon, so I may not get to it for a
> while unless you reply asap)

Have a good trip !

Cheers,
Ben.
Linus Torvalds - Jan. 29, 2013, 2:42 a.m.
On Mon, Jan 28, 2013 at 4:09 PM, Benjamin Herrenschmidt <
benh@kernel.crashing.org> wrote:
>
> It wasn't meant to be "snarky", sorry about that...

I'm kidding, I'm kidding, you can be as snarky as you want. It's not like
I'm some fragile flower.

> My usual problem with git request-pull when the mirror haven't caught up
> yet. Branch is "merge".

Ok, I see it. Pulled and pushed out,

      Linus
Geert Uytterhoeven - Jan. 29, 2013, 2:14 p.m.
On Tue, Jan 29, 2013 at 1:09 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> On Mon, 2013-01-28 at 16:03 -0800, Linus Torvalds wrote:
>> I'll have you know that I haven't quite even left for Au yet, and I
>> have LCA before diving. So no snarky "in between dives" comments,
>> please.
>
> It wasn't meant to be "snarky", sorry about that...

Sharky? Sorry, couldn't resist.

Gr{oetje,eeting}s,

                        Poor Geert without sun, dives, and sharks

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds