* [GIT PULL] [for 3.4] git pull request for arch-pxa
@ 2012-02-27 3:18 Haojian Zhuang
2012-02-27 15:16 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Haojian Zhuang @ 2012-02-27 3:18 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Please help to pull these patches for v3.4.
The following changes since commit c38e23456278e967f094b08247ffc3711b1029b2:
i387: fix sense of sanity check (2012-02-15 08:05:18 -0800)
are available in the git repository at:
git://github.com/hzhuang1/linux.git for-next
Haojian Zhuang (7):
rtc: sa1100: remove periodic code
rtc: sa1100: remove verification code of alarm
rtc: sa1100: declare irq in resource
ARM: pxa: add rtc dummy clock
rtc: sa1100: enable clk support
ARM: mmp: enable rtc in pxa910
ARM: mmp: append irq name of gpio device
Jett.Zhou (1):
ARM: sa1100: clean up clock support
Paul Parsons (4):
pxa/hx4700: Correct StrataFlash block size discovery
pxa/hx4700: Add ASIC3 LED support
pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values
pxa/hx4700: Fix basic suspend/resume
arch/arm/Kconfig | 3 +-
arch/arm/mach-mmp/include/mach/pxa910.h | 1 +
arch/arm/mach-mmp/include/mach/regs-apbc.h | 1 +
arch/arm/mach-mmp/include/mach/regs-rtc.h | 23 ++++
arch/arm/mach-mmp/mmp2.c | 1 +
arch/arm/mach-mmp/pxa168.c | 1 +
arch/arm/mach-mmp/pxa910.c | 28 ++++
arch/arm/mach-mmp/ttc_dkb.c | 1 +
arch/arm/mach-pxa/devices.c | 28 ++++-
arch/arm/mach-pxa/hx4700.c | 40 +++++-
arch/arm/mach-pxa/pxa25x.c | 1 +
arch/arm/mach-pxa/pxa27x.c | 1 +
arch/arm/mach-pxa/pxa3xx.c | 1 +
arch/arm/mach-pxa/pxa95x.c | 1 +
arch/arm/mach-sa1100/clock.c | 82 +++++++-----
arch/arm/mach-sa1100/generic.c | 8 +
drivers/rtc/Kconfig | 4 +-
drivers/rtc/rtc-sa1100.c | 198 ++++++++++++++--------------
18 files changed, 271 insertions(+), 152 deletions(-)
create mode 100644 arch/arm/mach-mmp/include/mach/regs-rtc.h
^ permalink raw reply [flat|nested] 4+ messages in thread* [GIT PULL] [for 3.4] git pull request for arch-pxa
2012-02-27 3:18 [GIT PULL] [for 3.4] git pull request for arch-pxa Haojian Zhuang
@ 2012-02-27 15:16 ` Arnd Bergmann
2012-02-28 2:01 ` Haojian Zhuang
2012-02-28 2:10 ` Haojian Zhuang
0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2012-02-27 15:16 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 27 February 2012, Haojian Zhuang wrote:
> Please help to pull these patches for v3.4.
>
> The following changes since commit c38e23456278e967f094b08247ffc3711b1029b2:
>
> i387: fix sense of sanity check (2012-02-15 08:05:18 -0800)
>
> are available in the git repository at:
> git://github.com/hzhuang1/linux.git for-next
>
> Haojian Zhuang (7):
> rtc: sa1100: remove periodic code
> rtc: sa1100: remove verification code of alarm
> rtc: sa1100: declare irq in resource
> ARM: pxa: add rtc dummy clock
> rtc: sa1100: enable clk support
> ARM: mmp: enable rtc in pxa910
> ARM: mmp: append irq name of gpio device
>
> Jett.Zhou (1):
> ARM: sa1100: clean up clock support
>
> Paul Parsons (4):
> pxa/hx4700: Correct StrataFlash block size discovery
> pxa/hx4700: Add ASIC3 LED support
> pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values
> pxa/hx4700: Fix basic suspend/resume
Hi Haojian,
Please follow the same rules for arm-soc pull requests as everyone
else. In particular, don't rebase your patches on a random changeset
for Linus but use an -rc tag as the base isntead, and split your
patches into topic branches:
The rtc changes clearly belong into one branch, while the cleanup
and hx4700 changes do not. I would suggest sending three pull
requests, one for cleanup, rtc and board specific changes.
Ideally, the first two patches from the rtc series ("remove periodic
code" and "remove verification code of alarm") would be in both
the rtc series and the cleanup branch.
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread* [GIT PULL] [for 3.4] git pull request for arch-pxa
2012-02-27 15:16 ` Arnd Bergmann
@ 2012-02-28 2:01 ` Haojian Zhuang
2012-02-28 2:10 ` Haojian Zhuang
1 sibling, 0 replies; 4+ messages in thread
From: Haojian Zhuang @ 2012-02-28 2:01 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 27, 2012 at 11:16 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Monday 27 February 2012, Haojian Zhuang wrote:
>> Please help to pull these patches for v3.4.
>>
>> The following changes since commit c38e23456278e967f094b08247ffc3711b1029b2:
>>
>> ? i387: fix sense of sanity check (2012-02-15 08:05:18 -0800)
>>
>> are available in the git repository at:
>> ? git://github.com/hzhuang1/linux.git for-next
>>
>> Haojian Zhuang (7):
>> ? ? ? rtc: sa1100: remove periodic code
>> ? ? ? rtc: sa1100: remove verification code of alarm
>> ? ? ? rtc: sa1100: declare irq in resource
>> ? ? ? ARM: pxa: add rtc dummy clock
>> ? ? ? rtc: sa1100: enable clk support
>> ? ? ? ARM: mmp: enable rtc in pxa910
>> ? ? ? ARM: mmp: append irq name of gpio device
>>
>> Jett.Zhou (1):
>> ? ? ? ARM: sa1100: clean up clock support
>>
>> Paul Parsons (4):
>> ? ? ? pxa/hx4700: Correct StrataFlash block size discovery
>> ? ? ? pxa/hx4700: Add ASIC3 LED support
>> ? ? ? pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values
>> ? ? ? pxa/hx4700: Fix basic suspend/resume
>
> Hi Haojian,
>
> Please follow the same rules for arm-soc pull requests as everyone
> else. In particular, don't rebase your patches on a random changeset
> for Linus but use an -rc tag as the base isntead, and split your
> patches into topic branches:
>
> The rtc changes clearly belong into one branch, while the cleanup
> and hx4700 changes do not. I would suggest sending three pull
> requests, one for cleanup, rtc and board specific changes.
> Ideally, the first two patches from the rtc series ("remove periodic
> code" and "remove verification code of alarm") would be in both
> the rtc series and the cleanup branch.
>
> ? ? ? ?Arnd
Sure. I'll do it now.
Best Regards
Haojian
^ permalink raw reply [flat|nested] 4+ messages in thread* [GIT PULL] [for 3.4] git pull request for arch-pxa
2012-02-27 15:16 ` Arnd Bergmann
2012-02-28 2:01 ` Haojian Zhuang
@ 2012-02-28 2:10 ` Haojian Zhuang
1 sibling, 0 replies; 4+ messages in thread
From: Haojian Zhuang @ 2012-02-28 2:10 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 27, 2012 at 11:16 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Monday 27 February 2012, Haojian Zhuang wrote:
>> Please help to pull these patches for v3.4.
>>
>> The following changes since commit c38e23456278e967f094b08247ffc3711b1029b2:
>>
>> ? i387: fix sense of sanity check (2012-02-15 08:05:18 -0800)
>>
>> are available in the git repository at:
>> ? git://github.com/hzhuang1/linux.git for-next
>>
>> Haojian Zhuang (7):
>> ? ? ? rtc: sa1100: remove periodic code
>> ? ? ? rtc: sa1100: remove verification code of alarm
>> ? ? ? rtc: sa1100: declare irq in resource
>> ? ? ? ARM: pxa: add rtc dummy clock
>> ? ? ? rtc: sa1100: enable clk support
>> ? ? ? ARM: mmp: enable rtc in pxa910
>> ? ? ? ARM: mmp: append irq name of gpio device
>>
>> Jett.Zhou (1):
>> ? ? ? ARM: sa1100: clean up clock support
>>
>> Paul Parsons (4):
>> ? ? ? pxa/hx4700: Correct StrataFlash block size discovery
>> ? ? ? pxa/hx4700: Add ASIC3 LED support
>> ? ? ? pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values
>> ? ? ? pxa/hx4700: Fix basic suspend/resume
>
> Hi Haojian,
>
> Please follow the same rules for arm-soc pull requests as everyone
> else. In particular, don't rebase your patches on a random changeset
> for Linus but use an -rc tag as the base isntead, and split your
> patches into topic branches:
>
> The rtc changes clearly belong into one branch, while the cleanup
> and hx4700 changes do not. I would suggest sending three pull
> requests, one for cleanup, rtc and board specific changes.
> Ideally, the first two patches from the rtc series ("remove periodic
> code" and "remove verification code of alarm") would be in both
> the rtc series and the cleanup branch.
>
> ? ? ? ?Arnd
Does it mean that I should let the same commit exist in two branch if
there's code dependancy?
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-02-28 2:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-27 3:18 [GIT PULL] [for 3.4] git pull request for arch-pxa Haojian Zhuang
2012-02-27 15:16 ` Arnd Bergmann
2012-02-28 2:01 ` Haojian Zhuang
2012-02-28 2:10 ` Haojian Zhuang
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).