Skip to contentSkip to conversation

AT91: patches for v2.6.38-rc1

GIT PULL Nicolas Ferre 2 participants 4 messages Jan 14, 2011

lore
Share & tools
lore
#0 lore raw

Hi Russell,

Can you please pull those little changes for AT91? They add two new boards already discussed on the mailing list and a little cleanup patch:

The following changes since commit 9e9bc9736756f25d6c47b4eba0ebf25b20a6f153:

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (2011-01-06 18:32:12 -0800)

are available in the git repository at:

git://github.com/at91linux/linux-2.6-at91.git for_rmk

Igor Plyatov (1):
AT91: Support for gsia18s board

Jesper Juhl (1):
AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h

Sergio Tanzilli (1):
AT91: Acme Systems FOX Board G20 board files

 arch/arm/mach-at91/Kconfig                |   13 +
 arch/arm/mach-at91/Makefile               |    2 +
 arch/arm/mach-at91/board-foxg20.c         |  274 ++++++++++++++
 arch/arm/mach-at91/board-gsia18s.c        |  584 +++++++++++++++++++++++++++++
 arch/arm/mach-at91/board-sam9m10g45ek.c   |    1 -
 arch/arm/mach-at91/include/mach/gsia18s.h |   33 ++
 6 files changed, 906 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-at91/board-foxg20.c
 create mode 100644 arch/arm/mach-at91/board-gsia18s.c
 create mode 100644 arch/arm/mach-at91/include/mach/gsia18s.h

Thanks, best regards,

Signature · 1 line
Nicolas Ferre
#1 lore raw
Quoted 5 lines · Nicolas Ferre

Hi Russell,

Can you please pull those little changes for AT91? They add two new boards already discussed on the mailing list and a little cleanup patch:

Has this already been in linux-next?

We should only be merging new code during a merge window which has already had visibility in linux-next, with the exception of bug fixes and regression fixes.

Regression fixes can be merged at any time provided they're obvious. Any regression fix should be acceptable during the merge window.

Bug fixes any time up until (I'd say) the last week of the -rc series.

#2 lore raw

Le 14/01/2011 19:04, Russell King - ARM Linux :

Quoted 8 lines · Nicolas Ferre
Quoted 5 lines

Hi Russell,

Can you please pull those little changes for AT91? They add two new boards already discussed on the mailing list and a little cleanup patch:

Has this already been in linux-next?

I must admit that... no.

Quoted 3 lines

We should only be merging new code during a merge window which has already had visibility in linux-next, with the exception of bug fixes and regression fixes.

I understand your point but those are only *board* files that are lying around for one or two months.
I was really wishing to see them included in mainline during merge window as they are not core ARM nor AT91 files...

BTW the git tree is based on the tree you specify to Eric: "9e9bc973".

Quoted 4 lines

Regression fixes can be merged at any time provided they're obvious. Any regression fix should be acceptable during the merge window.

Bug fixes any time up until (I'd say) the last week of the -rc series.

Best regards,

Signature · 1 line
Nicolas Ferre
#3 lore raw
Quoted 12 lines · Nicolas Ferre

Le 14/01/2011 19:04, Russell King - ARM Linux :

Quoted 8 lines · Nicolas Ferre
Quoted 5 lines

Hi Russell,

Can you please pull those little changes for AT91? They add two new boards already discussed on the mailing list and a little cleanup patch:

Has this already been in linux-next?

I must admit that... no.

Quoted 8 lines
Quoted 3 lines

We should only be merging new code during a merge window which has already had visibility in linux-next, with the exception of bug fixes and regression fixes.

I understand your point but those are only *board* files that are lying around for one or two months.
I was really wishing to see them included in mainline during merge window as they are not core ARM nor AT91 files...

Okay for this time, but please ensure that stuff like this is in linux-next before the merge window next time so that it can have some exposure.