[GIT PULL] pxa: fixes for 2.6.38-rc

[GIT PULL] pxa: fixes for 2.6.38-rc

[Eric Miao]

Hi Russell,

The following changes since commit aebf2fc9dc974270b4b25a83816c7051c73f07c8:

  it8152: add IT8152_LAST_IRQ definition to fix build error
(2011-01-02 23:21:14 +0800)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git devel

Eric Miao (1):
      ARM: pxa: fix recursive calls in pxa_low_gpio_chip

Marek Vasut (4):
      ARM: pxa: fix warning in zeus.c
      ARM: pxa: remove unused variable in clock-pxa3xx.c
      ARM: pxa: use cpu_has_ipr() consistently in irq.c
      ARM: pxa: fix suspend/resume array index miscalculation

Pavel Machek (1):
      ARM: sa1111: fix typo in sa1111_retrigger_lowirq()

Philip Rakity (2):
      ARM: mmp: MMP2 drive strength FAST using wrong value
      ARM: mmp: PXA910 drive strength FAST using wrong value

 arch/arm/common/sa1111.c                    |    2 +-
 arch/arm/mach-mmp/include/mach/mfp-mmp2.h   |    2 +-
 arch/arm/mach-mmp/include/mach/mfp-pxa910.h |    2 +-
 arch/arm/mach-pxa/clock-pxa3xx.c            |    1 -
 arch/arm/mach-pxa/irq.c                     |   49 ++++++++++-----------------
 arch/arm/mach-pxa/zeus.c                    |    4 +-
 6 files changed, 23 insertions(+), 37 deletions(-)

[GIT PULL] pxa: fixes for 2.6.38-rc

[Russell King - ARM Linux]

On Thu, Jan 13, 2011 at 03:15:21PM -0600, Eric Miao wrote:
> Hi Russell,
> 
> The following changes since commit aebf2fc9dc974270b4b25a83816c7051c73f07c8:
> 
>   it8152: add IT8152_LAST_IRQ definition to fix build error
> (2011-01-02 23:21:14 +0800)

Nope, not pulling.

I don't have this in my tree, and it doesn't appear to exist in Linus'
tree either.  There is this commit:

commit 823a2df258627b80df2e75056b850424a8eb5fed
Author: Mike Rapoport <mike@compulab.co.il>
Date:   Wed Dec 29 09:06:26 2010 +0200

    ARM: it8152: add IT8152_LAST_IRQ definition to fix build error

    The commit 6ac6b817f3f4c23c5febd960d8deb343e13af5f3 (ARM: pxa: encode
    IRQ number into .nr_irqs) removed definition of ITE_LAST_IRQ which
    caused the following build error:

    CC      arch/arm/common/it8152.o
    arch/arm/common/it8152.c: In function 'it8152_init_irq':
    arch/arm/common/it8152.c:86: error: 'IT8152_LAST_IRQ' undeclared (first use
    arch/arm/common/it8152.c:86: error: (Each undeclared identifier is reported
    arch/arm/common/it8152.c:86: error: for each function it appears in.)
    make[2]: *** [arch/arm/common/it8152.o] Error 1

    Defining the IT8152_LAST_IRQ in the arch/arm/include/hardware/it8152.c
    fixes the build.

    Signed-off-by: Mike Rapoport <mike@compulab.co.il>
    Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

but although it matches the summary, it has a different commit ID.

I smell a rebase of code already merged into mainline, and it stinks.

[GIT PULL] pxa: fixes for 2.6.38-rc

[Russell King - ARM Linux]

On Thu, Jan 13, 2011 at 11:02:35PM +0000, Russell King - ARM Linux wrote:
> On Thu, Jan 13, 2011 at 03:15:21PM -0600, Eric Miao wrote:
> > Hi Russell,
> > 
> > The following changes since commit aebf2fc9dc974270b4b25a83816c7051c73f07c8:
> > 
> >   it8152: add IT8152_LAST_IRQ definition to fix build error
> > (2011-01-02 23:21:14 +0800)
> 
> Nope, not pulling.
> 
> I don't have this in my tree, and it doesn't appear to exist in Linus'
> tree either.  There is this commit:

Eric, I'm planning to do my final push for this merge window this
evening, so I'd like to know whether it's likely that you'll have
this fixed by then?

Thanks.

[GIT PULL] pxa: fixes for 2.6.38-rc

[Eric Miao]

On Fri, Jan 14, 2011 at 7:34 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Thu, Jan 13, 2011 at 11:02:35PM +0000, Russell King - ARM Linux wrote:
>> On Thu, Jan 13, 2011 at 03:15:21PM -0600, Eric Miao wrote:
>> > Hi Russell,
>> >
>> > The following changes since commit aebf2fc9dc974270b4b25a83816c7051c73f07c8:
>> >
>> > ? it8152: add IT8152_LAST_IRQ definition to fix build error
>> > (2011-01-02 23:21:14 +0800)
>>
>> Nope, not pulling.
>>
>> I don't have this in my tree, and it doesn't appear to exist in Linus'
>> tree either. ?There is this commit:
>
> Eric, I'm planning to do my final push for this merge window this
> evening, so I'd like to know whether it's likely that you'll have
> this fixed by then?

Sorry, working on this right now. Will send out the pull minutes later
again.

>
> Thanks.
>

[GIT PULL] pxa: fixes for 2.6.38-rc

[Russell King - ARM Linux]

On Fri, Jan 14, 2011 at 01:34:35PM +0000, Russell King - ARM Linux wrote:
> On Thu, Jan 13, 2011 at 11:02:35PM +0000, Russell King - ARM Linux wrote:
> > On Thu, Jan 13, 2011 at 03:15:21PM -0600, Eric Miao wrote:
> > > Hi Russell,
> > > 
> > > The following changes since commit aebf2fc9dc974270b4b25a83816c7051c73f07c8:
> > > 
> > >   it8152: add IT8152_LAST_IRQ definition to fix build error
> > > (2011-01-02 23:21:14 +0800)
> > 
> > Nope, not pulling.
> > 
> > I don't have this in my tree, and it doesn't appear to exist in Linus'
> > tree either.  There is this commit:
> 
> Eric, I'm planning to do my final push for this merge window this
> evening, so I'd like to know whether it's likely that you'll have
> this fixed by then?

Okay, I'm deferring until tomorrow - there's still a patch and one
git tree (PXA) containing fixes with problems.