linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] orion5x and footbridge compile fixes for 3.1
@ 2011-08-25 14:23 Rob Herring
  2011-08-25 15:37 ` Paul Gortmaker
  2011-08-26 15:53 ` Arnd Bergmann
  0 siblings, 2 replies; 5+ messages in thread
From: Rob Herring @ 2011-08-25 14:23 UTC (permalink / raw)
  To: linux-arm-kernel

Arnd,

Please pull for 3.1-rc. Footbridge and orion5x builds are currently
broken in 3.1 mainly due to my changes in this commit:

commit cc22b4c18540e5e8bf55c7d124044f9317527d3c
Author: Rob Herring <rob.herring@calxeda.com>
Date:   Tue Jun 28 21:22:40 2011 -0500

    ARM: set vga memory base at run-time


The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:

  Linux 3.1-rc3 (2011-08-22 11:42:53 -0700)

are available in the git repository at:
  git://git.jdl.com/software/linux-3.0.git fixes

Bryan Wu (2):
      ARM: mach-orion5x: add missing header file <linux/vga.h>
      ARM: mach-footbridge: add missing header file <video/vga.h>

Paul Gortmaker (1):
      arm: fix compile failure in orion5x/dns323-setup.c

 arch/arm/mach-footbridge/dc21285.c   |    1 +
 arch/arm/mach-orion5x/dns323-setup.c |    2 +-
 arch/arm/mach-orion5x/pci.c          |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)

Rob

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

* [GIT PULL] orion5x and footbridge compile fixes for 3.1
  2011-08-25 14:23 [GIT PULL] orion5x and footbridge compile fixes for 3.1 Rob Herring
@ 2011-08-25 15:37 ` Paul Gortmaker
  2011-08-26 15:53 ` Arnd Bergmann
  1 sibling, 0 replies; 5+ messages in thread
From: Paul Gortmaker @ 2011-08-25 15:37 UTC (permalink / raw)
  To: linux-arm-kernel

On 11-08-25 10:23 AM, Rob Herring wrote:
> Arnd,
> 
> Please pull for 3.1-rc. Footbridge and orion5x builds are currently
> broken in 3.1 mainly due to my changes in this commit:
> 
> commit cc22b4c18540e5e8bf55c7d124044f9317527d3c
> Author: Rob Herring <rob.herring@calxeda.com>
> Date:   Tue Jun 28 21:22:40 2011 -0500
> 
>     ARM: set vga memory base at run-time
> 
> 
> The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:
> 
>   Linux 3.1-rc3 (2011-08-22 11:42:53 -0700)
> 
> are available in the git repository at:
>   git://git.jdl.com/software/linux-3.0.git fixes
> 
> Bryan Wu (2):
>       ARM: mach-orion5x: add missing header file <linux/vga.h>
>       ARM: mach-footbridge: add missing header file <video/vga.h>

I had similar commits to the two above in the module.h tree
(in linux-next) since I thought the missing vga.h was fallout
from the implicit presence of module.h everywhere.

I'll drop all three from linux-next now that they are scheduled
for pulling into 3.1-rcN.

Thanks,
Paul.

> 
> Paul Gortmaker (1):
>       arm: fix compile failure in orion5x/dns323-setup.c
> 
>  arch/arm/mach-footbridge/dc21285.c   |    1 +
>  arch/arm/mach-orion5x/dns323-setup.c |    2 +-
>  arch/arm/mach-orion5x/pci.c          |    1 +
>  3 files changed, 3 insertions(+), 1 deletions(-)
> 
> Rob

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

* [GIT PULL] orion5x and footbridge compile fixes for 3.1
  2011-08-25 14:23 [GIT PULL] orion5x and footbridge compile fixes for 3.1 Rob Herring
  2011-08-25 15:37 ` Paul Gortmaker
@ 2011-08-26 15:53 ` Arnd Bergmann
  2011-08-26 16:05   ` Rob Herring
  1 sibling, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2011-08-26 15:53 UTC (permalink / raw)
  To: linux-arm-kernel

On Thursday 25 August 2011, Rob Herring wrote:
> Please pull for 3.1-rc. Footbridge and orion5x builds are currently
> broken in 3.1 mainly due to my changes in this commit:
> 
> commit cc22b4c18540e5e8bf55c7d124044f9317527d3c
> Author: Rob Herring <rob.herring@calxeda.com>
> Date:   Tue Jun 28 21:22:40 2011 -0500
> 
>     ARM: set vga memory base at run-time
> 
> 
> The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:
> 

Pulled, thanks!

BTW, are you planning to get your own git tree in the future or do you keep using
Jon's git.jdl.com server?

It should be no problem for you to get hosting on git.kernel.org, there is
a FAQ somewhere. With the current situation, it's now clear from the changelog
why I am pulling patches from Jon's server with your Signed-off-by.

	Arnd

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

* [GIT PULL] orion5x and footbridge compile fixes for 3.1
  2011-08-26 15:53 ` Arnd Bergmann
@ 2011-08-26 16:05   ` Rob Herring
  2011-08-26 16:18     ` Arnd Bergmann
  0 siblings, 1 reply; 5+ messages in thread
From: Rob Herring @ 2011-08-26 16:05 UTC (permalink / raw)
  To: linux-arm-kernel

Arnd,

On 08/26/2011 10:53 AM, Arnd Bergmann wrote:
> On Thursday 25 August 2011, Rob Herring wrote:
>> Please pull for 3.1-rc. Footbridge and orion5x builds are currently
>> broken in 3.1 mainly due to my changes in this commit:
>>
>> commit cc22b4c18540e5e8bf55c7d124044f9317527d3c
>> Author: Rob Herring <rob.herring@calxeda.com>
>> Date:   Tue Jun 28 21:22:40 2011 -0500
>>
>>     ARM: set vga memory base at run-time
>>
>>
>> The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:
>>
> 
> Pulled, thanks!
> 
> BTW, are you planning to get your own git tree in the future or do you keep using
> Jon's git.jdl.com server?

It is mine basically, just on Jon's domain. But yes, it's on the IT guys
todo list... Jon was just the quickest path.

> 
> It should be no problem for you to get hosting on git.kernel.org, there is
> a FAQ somewhere. With the current situation, it's now clear from the changelog
> why I am pulling patches from Jon's server with your Signed-off-by.
> 
Why would 3 Marvell patches from me be strange... :)
It wasn't really clear to me whether you were going to pick them off the
list and were aware of all 3 patches, so I just decided to make it easy
for you.

Rob

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

* [GIT PULL] orion5x and footbridge compile fixes for 3.1
  2011-08-26 16:05   ` Rob Herring
@ 2011-08-26 16:18     ` Arnd Bergmann
  0 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2011-08-26 16:18 UTC (permalink / raw)
  To: linux-arm-kernel

On Friday 26 August 2011, Rob Herring wrote:
> > It should be no problem for you to get hosting on git.kernel.org, there is
> > a FAQ somewhere. With the current situation, it's now clear from the changelog
> > why I am pulling patches from Jon's server with your Signed-off-by.
> > 
> Why would 3 Marvell patches from me be strange... :)
> It wasn't really clear to me whether you were going to pick them off the
> list and were aware of all 3 patches, so I just decided to make it easy
> for you.

It's all good and for three patches there is no worry at all. I was mainly
wondering about the long-term plans the larger series that you are
submitting.

	Arnd

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

end of thread, other threads:[~2011-08-26 16:18 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-25 14:23 [GIT PULL] orion5x and footbridge compile fixes for 3.1 Rob Herring
2011-08-25 15:37 ` Paul Gortmaker
2011-08-26 15:53 ` Arnd Bergmann
2011-08-26 16:05   ` Rob Herring
2011-08-26 16:18     ` Arnd Bergmann

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).