Hi Linus,
please pull
git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6.git for-linus
to receive the following updates for 3.0
Hans-Christian Egtvedt (4):
avr32: fix use of non-existing portnr variable in at32_map_usart()
avr32/at32ap: fix mapping of platform device id for USART
avr32: set CONFIG_CC_OPTIMIZE_FOR_SIZE=y for all defconfigs
avr32: make intc_resume() return void to conform to syscore_ops
Mathias Krause (1):
avr32, exec: remove redundant set_fs(USER_DS)
Nicolas Ferre (1):
avr32: add some more at91 to cpu.h definition
arch/avr32/configs/atngw100_defconfig | 1 -
arch/avr32/configs/atngw100_evklcd100_defconfig | 1 -
arch/avr32/configs/atngw100_evklcd101_defconfig | 1 -
arch/avr32/configs/atngw100_mrmt_defconfig | 1 -
arch/avr32/configs/atngw100mkii_defconfig | 1 -
.../avr32/configs/atngw100mkii_evklcd100_defconfig | 1 -
.../avr32/configs/atngw100mkii_evklcd101_defconfig | 1 -
arch/avr32/configs/atstk1002_defconfig | 1 -
arch/avr32/configs/atstk1003_defconfig | 1 -
arch/avr32/configs/atstk1004_defconfig | 1 -
arch/avr32/configs/atstk1006_defconfig | 1 -
arch/avr32/configs/favr-32_defconfig | 1 -
arch/avr32/configs/hammerhead_defconfig | 1 -
arch/avr32/configs/merisc_defconfig | 1 -
arch/avr32/configs/mimc200_defconfig | 1 -
arch/avr32/include/asm/processor.h | 1 +
arch/avr32/mach-at32ap/at32ap700x.c | 3 +--
arch/avr32/mach-at32ap/include/mach/cpu.h | 12 ------------
arch/avr32/mach-at32ap/intc.c | 4 +++-
19 files changed, 5 insertions(+), 30 deletions(-)
--
Hans-Christian Egtvedt
On Tue, Jun 14, 2011 at 5:33 AM, Hans-Christian Egtvedt
<[email protected]> wrote:
>
> ?arch/avr32/configs/atngw100_defconfig ? ? ? ? ? ? ?| ? ?1 -
> ?arch/avr32/configs/atngw100_evklcd100_defconfig ? ?| ? ?1 -
> ?arch/avr32/configs/atngw100_evklcd101_defconfig ? ?| ? ?1 -
> ?arch/avr32/configs/atngw100_mrmt_defconfig ? ? ? ? | ? ?1 -
> ?arch/avr32/configs/atngw100mkii_defconfig ? ? ? ? ?| ? ?1 -
> ?.../avr32/configs/atngw100mkii_evklcd100_defconfig | ? ?1 -
> ?.../avr32/configs/atngw100mkii_evklcd101_defconfig | ? ?1 -
> ?arch/avr32/configs/atstk1002_defconfig ? ? ? ? ? ? | ? ?1 -
> ?arch/avr32/configs/atstk1003_defconfig ? ? ? ? ? ? | ? ?1 -
> ?arch/avr32/configs/atstk1004_defconfig ? ? ? ? ? ? | ? ?1 -
> ?arch/avr32/configs/atstk1006_defconfig ? ? ? ? ? ? | ? ?1 -
> ?arch/avr32/configs/favr-32_defconfig ? ? ? ? ? ? ? | ? ?1 -
> ?arch/avr32/configs/hammerhead_defconfig ? ? ? ? ? ?| ? ?1 -
> ?arch/avr32/configs/merisc_defconfig ? ? ? ? ? ? ? ?| ? ?1 -
> ?arch/avr32/configs/mimc200_defconfig ? ? ? ? ? ? ? | ? ?1 -
> ?arch/avr32/include/asm/processor.h ? ? ? ? ? ? ? ? | ? ?1 +
> ?arch/avr32/mach-at32ap/at32ap700x.c ? ? ? ? ? ? ? ?| ? ?3 +--
> ?arch/avr32/mach-at32ap/include/mach/cpu.h ? ? ? ? ?| ? 12 ------------
> ?arch/avr32/mach-at32ap/intc.c ? ? ? ? ? ? ? ? ? ? ?| ? ?4 +++-
> ?19 files changed, 5 insertions(+), 30 deletions(-)
How did you generate that pull request? I was all "Yay - code
removal!", but then when actually pulling, noticed that your diffstat
was exactly the wrong way around (the removals were adds, the adds
were removals), and the real stats end up being
19 files changed, 30 insertions(+), 5 deletions(-)
instead :(
Linus
On Tue, 2011-06-14 at 11:28 -0700, Linus Torvalds wrote:
> On Tue, Jun 14, 2011 at 5:33 AM, Hans-Christian Egtvedt
> <[email protected]> wrote:
> >
> > arch/avr32/configs/atngw100_defconfig | 1 -
> > arch/avr32/configs/atngw100_evklcd100_defconfig | 1 -
> > arch/avr32/configs/atngw100_evklcd101_defconfig | 1 -
> > arch/avr32/configs/atngw100_mrmt_defconfig | 1 -
> > arch/avr32/configs/atngw100mkii_defconfig | 1 -
> > .../avr32/configs/atngw100mkii_evklcd100_defconfig | 1 -
> > .../avr32/configs/atngw100mkii_evklcd101_defconfig | 1 -
> > arch/avr32/configs/atstk1002_defconfig | 1 -
> > arch/avr32/configs/atstk1003_defconfig | 1 -
> > arch/avr32/configs/atstk1004_defconfig | 1 -
> > arch/avr32/configs/atstk1006_defconfig | 1 -
> > arch/avr32/configs/favr-32_defconfig | 1 -
> > arch/avr32/configs/hammerhead_defconfig | 1 -
> > arch/avr32/configs/merisc_defconfig | 1 -
> > arch/avr32/configs/mimc200_defconfig | 1 -
> > arch/avr32/include/asm/processor.h | 1 +
> > arch/avr32/mach-at32ap/at32ap700x.c | 3 +--
> > arch/avr32/mach-at32ap/include/mach/cpu.h | 12 ------------
> > arch/avr32/mach-at32ap/intc.c | 4 +++-
> > 19 files changed, 5 insertions(+), 30 deletions(-)
>
> How did you generate that pull request? I was all "Yay - code
> removal!", but then when actually pulling, noticed that your diffstat
> was exactly the wrong way around (the removals were adds, the adds
> were removals), and the real stats end up being
>
> 19 files changed, 30 insertions(+), 5 deletions(-)
>
> instead :(
Sorry, my bad, trusting my shells history. "master.." was swapped to
"..master". Since the volume for AVR32 related patches are so low, I do
stuff like this manually. Which now resulted in inverted statistics.
Correct diff stat is
arch/avr32/configs/atngw100_defconfig | 1 +
arch/avr32/configs/atngw100_evklcd100_defconfig | 1 +
arch/avr32/configs/atngw100_evklcd101_defconfig | 1 +
arch/avr32/configs/atngw100_mrmt_defconfig | 1 +
arch/avr32/configs/atngw100mkii_defconfig | 1 +
.../avr32/configs/atngw100mkii_evklcd100_defconfig | 1 +
.../avr32/configs/atngw100mkii_evklcd101_defconfig | 1 +
arch/avr32/configs/atstk1002_defconfig | 1 +
arch/avr32/configs/atstk1003_defconfig | 1 +
arch/avr32/configs/atstk1004_defconfig | 1 +
arch/avr32/configs/atstk1006_defconfig | 1 +
arch/avr32/configs/favr-32_defconfig | 1 +
arch/avr32/configs/hammerhead_defconfig | 1 +
arch/avr32/configs/merisc_defconfig | 1 +
arch/avr32/configs/mimc200_defconfig | 1 +
arch/avr32/include/asm/processor.h | 1 -
arch/avr32/mach-at32ap/at32ap700x.c | 3 ++-
arch/avr32/mach-at32ap/include/mach/cpu.h | 12 ++++++++++++
arch/avr32/mach-at32ap/intc.c | 4 +---
19 files changed, 30 insertions(+), 5 deletions(-)
--
Hans-Christian Egtvedt