| Submitter | Barry Song |
|---|---|
| Date | Oct. 1, 2011, 2:32 a.m. |
| Message ID | <CAGsJ_4xNqgDSWs-WQCamE592NB_p4r4+sY8-XSrzbkei1jeB7Q@mail.gmail.com> |
| Download | mbox |
| Permalink | /patch/117253/ |
| State | New |
| Headers | show |
Pull-request
git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git l2x0-cleanupComments
On Saturday 01 October 2011, Barry Song wrote: > Since the l2x0 cleanup of prima2 depends on the following two patches > in rmk's tree: > > [1]Rob Herring > ARM: 7009/1: l2x0: Add OF based initialization > http://www.spinics.net/lists/arm-kernel/msg131123.html > it has been in rmk/for-next > > [2]Barry Song > ARM: 7009/1: CACHE-L2X0: filter start address can be 0 and is often 0 > http://www.spinics.net/lists/arm-kernel/msg140126.html > it has been in rmk/for-next > > I have rebased the l2x0-cleanup branch to "ARM: 7009/1: CACHE-L2X0: > filter start address can be 0 and is often 0". this might cause some > issues to you. if that is difficult to you, i guess you can pich the > commmit and apply it when your tree has been ready. > > The following changes since commit 513d47a3d953e44d79c29077f6c428a017f8af62: > Barry Song (1): > ARM: 7090/1: CACHE-L2X0: filter start address can be 0 and is often 0 > > are available in the git repository at: > > git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git l2x0-cleanup I think I can keep track of this, but is the commit that you used actually from a stable branch in Russell's tree? If that gets rebased, I should not pull your patch in. Arnd
2011/10/8 Arnd Bergmann <arnd@arndb.de>: > On Saturday 01 October 2011, Barry Song wrote: >> Since the l2x0 cleanup of prima2 depends on the following two patches >> in rmk's tree: >> >> [1]Rob Herring >> ARM: 7009/1: l2x0: Add OF based initialization >> http://www.spinics.net/lists/arm-kernel/msg131123.html >> it has been in rmk/for-next >> >> [2]Barry Song >> ARM: 7009/1: CACHE-L2X0: filter start address can be 0 and is often 0 >> http://www.spinics.net/lists/arm-kernel/msg140126.html >> it has been in rmk/for-next >> >> I have rebased the l2x0-cleanup branch to "ARM: 7009/1: CACHE-L2X0: >> filter start address can be 0 and is often 0". this might cause some >> issues to you. if that is difficult to you, i guess you can pich the >> commmit and apply it when your tree has been ready. >> >> The following changes since commit 513d47a3d953e44d79c29077f6c428a017f8af62: >> Barry Song (1): >> ARM: 7090/1: CACHE-L2X0: filter start address can be 0 and is often 0 >> >> are available in the git repository at: >> >> git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git l2x0-cleanup > > I think I can keep track of this, but is the commit that you used actually > from a stable branch in Russell's tree? If that gets rebased, I should > not pull your patch in. not actually. the commit is in rmk/for-next. rmk might rebase for-next. you might apply this one after your local tree merge rmk's stable tree with this commit. > > Arnd > -barry
Hi Arnd, Since the l2x0 cleanup of prima2 depends on the following two patches in rmk's tree: [1]Rob Herring ARM: 7009/1: l2x0: Add OF based initialization http://www.spinics.net/lists/arm-kernel/msg131123.html it has been in rmk/for-next [2]Barry Song ARM: 7009/1: CACHE-L2X0: filter start address can be 0 and is often 0 http://www.spinics.net/lists/arm-kernel/msg140126.html it has been in rmk/for-next I have rebased the l2x0-cleanup branch to "ARM: 7009/1: CACHE-L2X0: filter start address can be 0 and is often 0". this might cause some issues to you. if that is difficult to you, i guess you can pich the commmit and apply it when your tree has been ready. The following changes since commit 513d47a3d953e44d79c29077f6c428a017f8af62: Barry Song (1): ARM: 7090/1: CACHE-L2X0: filter start address can be 0 and is often 0 are available in the git repository at: git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git l2x0-cleanup Barry Song (1): ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII arch/arm/boot/dts/prima2-cb.dts | 5 +++- arch/arm/mach-prima2/l2x0.c | 46 +++++++------------------------------- 2 files changed, 13 insertions(+), 38 deletions(-) Thanks barry