linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* "next" branch update
@ 2009-06-02  3:03 Benjamin Herrenschmidt
  2009-06-02  3:26 ` Grant Likely
  0 siblings, 1 reply; 12+ messages in thread
From: Benjamin Herrenschmidt @ 2009-06-02  3:03 UTC (permalink / raw)
  To: linuxppc-dev list

I've updated powerpc "next branch" with the following patches:

(Kumar: The swiotlb patch is still segregated in "test" until we resolve
how it's going to be merged vs. Ian Campbell series).

Anton Blanchard (1):
      powerpc: Convert RTAS event scan from kernel thread to workqueue

Michael Ellerman (3):
      powerpc/ftrace: Use ppc_function_entry() instead of GET_ADDR
      powerpc/ftrace: Remove unused macros
      powerpc/ftrace: Use PPC_INST_NOP directly

Michael Neuling (1):
      powerpc: Make the NR_CPUS max 8192

Michel Dänzer (1):
      therm_adt746x: Always clear hardware bit which inverts fan speed range.

Nathan Fontenot (1):
      powerpc: Display processor virtualization resource allocs in lparcfg

Stephen Rothwell (1):
      powerpc/pci: Fix annotation of pcibios_claim_one_bus

roel kluin (1):
      tape: beyond ARRAY_SIZE of viocd_diskinfo

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

* Re: "next" branch update
  2009-06-02  3:03 Benjamin Herrenschmidt
@ 2009-06-02  3:26 ` Grant Likely
  2009-06-02  3:44   ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 12+ messages in thread
From: Grant Likely @ 2009-06-02  3:26 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev list

[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]

How about the iomap_early() patch?  What would you like me to do with that
one?

g.

On Jun 1, 2009 9:04 PM, "Benjamin Herrenschmidt" <benh@kernel.crashing.org>
wrote:

I've updated powerpc "next branch" with the following patches:

(Kumar: The swiotlb patch is still segregated in "test" until we resolve
how it's going to be merged vs. Ian Campbell series).

Anton Blanchard (1):
     powerpc: Convert RTAS event scan from kernel thread to workqueue

Michael Ellerman (3):
     powerpc/ftrace: Use ppc_function_entry() instead of GET_ADDR
     powerpc/ftrace: Remove unused macros
     powerpc/ftrace: Use PPC_INST_NOP directly

Michael Neuling (1):
     powerpc: Make the NR_CPUS max 8192

Michel Dänzer (1):
     therm_adt746x: Always clear hardware bit which inverts fan speed range.

Nathan Fontenot (1):
     powerpc: Display processor virtualization resource allocs in lparcfg

Stephen Rothwell (1):
     powerpc/pci: Fix annotation of pcibios_claim_one_bus

roel kluin (1):
     tape: beyond ARRAY_SIZE of viocd_diskinfo



_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

[-- Attachment #2: Type: text/html, Size: 1635 bytes --]

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

* Re: "next" branch update
  2009-06-02  3:26 ` Grant Likely
@ 2009-06-02  3:44   ` Benjamin Herrenschmidt
  0 siblings, 0 replies; 12+ messages in thread
From: Benjamin Herrenschmidt @ 2009-06-02  3:44 UTC (permalink / raw)
  To: Grant Likely; +Cc: linuxppc-dev list

On Mon, 2009-06-01 at 21:26 -0600, Grant Likely wrote:
> How about the iomap_early() patch?  What would you like me to do with
> that one?

Wait for me to review it :-)

Cheers,
Ben.

> g.
> 
> > On Jun 1, 2009 9:04 PM, "Benjamin Herrenschmidt"
> > <benh@kernel.crashing.org> wrote:
> > 
> > I've updated powerpc "next branch" with the following patches:
> > 
> > (Kumar: The swiotlb patch is still segregated in "test" until we
> > resolve
> > how it's going to be merged vs. Ian Campbell series).
> > 
> > Anton Blanchard (1):
> >      powerpc: Convert RTAS event scan from kernel thread to
> > workqueue
> > 
> > Michael Ellerman (3):
> >      powerpc/ftrace: Use ppc_function_entry() instead of GET_ADDR
> >      powerpc/ftrace: Remove unused macros
> >      powerpc/ftrace: Use PPC_INST_NOP directly
> > 
> > Michael Neuling (1):
> >      powerpc: Make the NR_CPUS max 8192
> > 
> > Michel Dänzer (1):
> >      therm_adt746x: Always clear hardware bit which inverts fan
> > speed range.
> > 
> > Nathan Fontenot (1):
> >      powerpc: Display processor virtualization resource allocs in
> > lparcfg
> > 
> > Stephen Rothwell (1):
> >      powerpc/pci: Fix annotation of pcibios_claim_one_bus
> > 
> > roel kluin (1):
> >      tape: beyond ARRAY_SIZE of viocd_diskinfo
> > 
> > 
> > 
> > _______________________________________________
> > Linuxppc-dev mailing list
> > Linuxppc-dev@ozlabs.org
> > https://ozlabs.org/mailman/listinfo/linuxppc-dev
> 

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

* "next" branch update
@ 2009-06-10  3:14 Benjamin Herrenschmidt
  2009-06-10  4:13 ` Grant Likely
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Benjamin Herrenschmidt @ 2009-06-10  3:14 UTC (permalink / raw)
  To: linuxppc-dev list

Hi !

I've updated my "next" branch with the following patches. We're getting
real close to the merge window now, so if something is missing, please
holler ASAP.

Cheers,
Ben.

Becky Bruce (1):
      powerpc: Add support for swiotlb on 32-bit

Benjamin Herrenschmidt (8):
      powerpc/mm: Fix some SMP issues with MMU context handling
      powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
      powerpc: Set init_bootmem_done on NUMA platforms as well
      powerpc: Move VMX and VSX asm code to vector.S
      powerpc: Introduce CONFIG_PPC_BOOK3S
      powerpc: Split exception handling out of head_64.S
      powerpc: Separate PACA fields for server CPUs
      powerpc: Shield code specific to 64-bit server processors

Grant Likely (1):
      powerpc/virtex: refactor intc driver and add support for i8259 cascading

John Linn (1):
      fbdev: Add PLB support and cleanup DCR in xilinxfb driver.

Roderick Colenbrander (3):
      powerpc/virtex: Add support for Xilinx PCI host bridge
      powerpc/virtex: Add Xilinx ML510 reference design support
      powerpc/virtex: Add ml510 reference design device tree

Roland McGrath (1):
      powerpc: Add PTRACE_SINGLEBLOCK support

Stephen Rothwell (4):
      powerpc/pseries: Fix warnings when printing resource_size_t
      powerpc/xmon: Remove unused variable in xmon.c
      powerpc: Fix warning when printing a resource_size_t
      powerpc/spufs: Remove unused error path

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

* Re: "next" branch update
  2009-06-10  3:14 Benjamin Herrenschmidt
@ 2009-06-10  4:13 ` Grant Likely
  2009-06-10  6:07 ` Timur Tabi
  2009-06-11 17:05 ` Josh Boyer
  2 siblings, 0 replies; 12+ messages in thread
From: Grant Likely @ 2009-06-10  4:13 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev list

On Tue, Jun 9, 2009 at 9:14 PM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> Hi !
>
> I've updated my "next" branch with the following patches. We're getting
> real close to the merge window now, so if something is missing, please
> holler ASAP.

Just these two; but I see you've got them marked "under review":

http://patchwork.ozlabs.org/patch/28191/
http://patchwork.ozlabs.org/patch/27752/

g.

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

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

* Re: "next" branch update
  2009-06-10  3:14 Benjamin Herrenschmidt
  2009-06-10  4:13 ` Grant Likely
@ 2009-06-10  6:07 ` Timur Tabi
  2009-06-11 17:05 ` Josh Boyer
  2 siblings, 0 replies; 12+ messages in thread
From: Timur Tabi @ 2009-06-10  6:07 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev list

On Tue, Jun 9, 2009 at 10:14 PM, Benjamin
Herrenschmidt<benh@kernel.crashing.org> wrote:
> Hi !
>
> I've updated my "next" branch with the following patches. We're getting
> real close to the merge window now, so if something is missing, please
> holler ASAP.

[PATCH 1/2 v9] powerpc: introduce macro spin_event_timeout()

-- 
Timur Tabi
Linux kernel developer at Freescale

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

* Re: "next" branch update
  2009-06-10  3:14 Benjamin Herrenschmidt
  2009-06-10  4:13 ` Grant Likely
  2009-06-10  6:07 ` Timur Tabi
@ 2009-06-11 17:05 ` Josh Boyer
  2 siblings, 0 replies; 12+ messages in thread
From: Josh Boyer @ 2009-06-11 17:05 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev list

Quoting Benjamin Herrenschmidt <benh@kernel.crashing.org>:

> Hi !
>
> I've updated my "next" branch with the following patches. We're getting
> real close to the merge window now, so if something is missing, please
> holler ASAP.

Could you please pull the 'next' branch of the 4xx tree?  I haven't  
had a chance to generate a formal pull request due to travel and now  
an unexpected family issue.

josh

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

* "next" branch update
@ 2009-06-12  7:29 Benjamin Herrenschmidt
  2009-06-12 13:54 ` Timur Tabi
  0 siblings, 1 reply; 12+ messages in thread
From: Benjamin Herrenschmidt @ 2009-06-12  7:29 UTC (permalink / raw)
  To: linuxppc-dev list

I pushed the following commits, along with merging Linus tree in today.

Note that it will not boot on various machines unless the allocator
init ordering problem I mentioned earlier is fixed.

Benjamin Herrenschmidt (1):
      powerpc: Fix bug in move of altivec code to vector.S

Josh Boyer (3):
      powerpc/4xx: Disable PCI_LEGACY
      powerpc/40x: Convert AMCC Makalu board to ppc40x_simple
      powerpc/40x: Convert AMCC Kilauea/Halekala boards to ppc40x_simple

Sean MacLennan (1):
      i2c: Fix confusing i2c-ibm_iic message

Stefan Roese (1):
      powerpc/4xx: Sequoia: Enable NAND support

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

* Re: "next" branch update
  2009-06-12  7:29 Benjamin Herrenschmidt
@ 2009-06-12 13:54 ` Timur Tabi
  2009-06-12 13:59   ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 12+ messages in thread
From: Timur Tabi @ 2009-06-12 13:54 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev list

On Fri, Jun 12, 2009 at 2:29 AM, Benjamin
Herrenschmidt<benh@kernel.crashing.org> wrote:
> I pushed the following commits, along with merging Linus tree in today.

Is there a reason you keep ignoring my patch?

[PATCH 1/2 v9] powerpc: introduce macro spin_event_timeout()

There is PowerPC code in the ALSA tree that depends on my patch, so
that code will break if you don't push my patch upstream.

-- 
Timur Tabi
Linux kernel developer at Freescale

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

* Re: "next" branch update
  2009-06-12 13:54 ` Timur Tabi
@ 2009-06-12 13:59   ` Benjamin Herrenschmidt
  0 siblings, 0 replies; 12+ messages in thread
From: Benjamin Herrenschmidt @ 2009-06-12 13:59 UTC (permalink / raw)
  To: Timur Tabi; +Cc: linuxppc-dev list

On Fri, 2009-06-12 at 08:54 -0500, Timur Tabi wrote:
> On Fri, Jun 12, 2009 at 2:29 AM, Benjamin
> Herrenschmidt<benh@kernel.crashing.org> wrote:
> > I pushed the following commits, along with merging Linus tree in today.
> 
> Is there a reason you keep ignoring my patch?

Other than I hate you ? just kidding :-)

> [PATCH 1/2 v9] powerpc: introduce macro spin_event_timeout()
> 
> There is PowerPC code in the ALSA tree that depends on my patch, so
> that code will break if you don't push my patch upstream.

I know, and you may have noticed I haven't sent a pull request to Linus
yet... I was planning on scrubbing patchwork once more today and got
sidetracked with fixing the breakage that went into mainline already
while I was not looking :-)

I haven't closed powerpc-next, I know I'm late, but don't worry, your
patch is on my todo list.

Cheers,
Ben.

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

* "next" branch update
@ 2009-07-28  4:14 Benjamin Herrenschmidt
  2009-07-28  7:54 ` Martyn Welch
  0 siblings, 1 reply; 12+ messages in thread
From: Benjamin Herrenschmidt @ 2009-07-28  4:14 UTC (permalink / raw)
  To: linuxppc-dev list

So I opened powerpc-next, and pushed the pile that was in "test" (with
an additional bug fix to one of my patches that was causing the crash
at boot that mpe reported with hugetlbfs enabled).

The pre-req patch for adding an argument to __pte_free_tlb() has already
been merged upstream by Linus.

Now is time for people who want things into 2.6.32 to be noisy about it.

Cheers,
Ben.

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

* Re: "next" branch update
  2009-07-28  4:14 "next" branch update Benjamin Herrenschmidt
@ 2009-07-28  7:54 ` Martyn Welch
  0 siblings, 0 replies; 12+ messages in thread
From: Martyn Welch @ 2009-07-28  7:54 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev list

Benjamin Herrenschmidt wrote:
> So I opened powerpc-next, and pushed the pile that was in "test" (with
> an additional bug fix to one of my patches that was causing the crash
> at boot that mpe reported with hugetlbfs enabled).
>
> The pre-req patch for adding an argument to __pte_free_tlb() has already
> been merged upstream by Linus.
>
> Now is time for people who want things into 2.6.32 to be noisy about it.
>   
Hi Ben,

I'd like to get the NVRAM patches into 2.6.32, I know you said to pester 
you in a week but your asking now :-) :

http://patchwork.ozlabs.org/patch/29420/
http://patchwork.ozlabs.org/patch/29422/
http://patchwork.ozlabs.org/patch/29421/
http://patchwork.ozlabs.org/patch/29419/
http://patchwork.ozlabs.org/patch/29418/

There's also some updates to the boards I work on:

http://patchwork.ozlabs.org/patch/29404/
http://patchwork.ozlabs.org/patch/29403/
http://patchwork.ozlabs.org/patch/29402/
http://patchwork.ozlabs.org/patch/29335/
http://patchwork.ozlabs.org/patch/29332/

Kumar: have you had a chance to look at these / are you happy with them?

Martyn

-- 
Martyn Welch MEng MPhil MIET (Principal Software Engineer)   T:+44(0)1327322748
GE Fanuc Intelligent Platforms Ltd,        |Registered in England and Wales
Tove Valley Business Park, Towcester,      |(3828642) at 100 Barbirolli Square,
Northants, NN12 6PF, UK T:+44(0)1327359444 |Manchester,M2 3AB  VAT:GB 927559189

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

end of thread, other threads:[~2009-07-28  7:54 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-28  4:14 "next" branch update Benjamin Herrenschmidt
2009-07-28  7:54 ` Martyn Welch
  -- strict thread matches above, loose matches on Subject: below --
2009-06-12  7:29 Benjamin Herrenschmidt
2009-06-12 13:54 ` Timur Tabi
2009-06-12 13:59   ` Benjamin Herrenschmidt
2009-06-10  3:14 Benjamin Herrenschmidt
2009-06-10  4:13 ` Grant Likely
2009-06-10  6:07 ` Timur Tabi
2009-06-11 17:05 ` Josh Boyer
2009-06-02  3:03 Benjamin Herrenschmidt
2009-06-02  3:26 ` Grant Likely
2009-06-02  3:44   ` Benjamin Herrenschmidt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).