Skip to contentSkip to conversation

Blackfin: architecture update patch

PATCH Andrew Morton 2 participants 4 messages Mar 21, 2007 – Mar 22, 2007 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 1174472363.5648.58.camel@roc-desktop

#1 lore raw
Quoted 4 lines · Bryan

1) Some issues are fixed according to LKML patch review.
2) Remove not supported BF535 code
3) Fixed some bugs from blackfin.uclinux.org SVN update Here is the updated patch for 2.6.21-rc4-mm1

1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/cplbinit.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/mach-bf535/bf535.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/scatterlist.h.rej

This seems to be against a kernel which did not include blackfin-arch-balance-parenthesis-in-macros.patch. But 2.6.21-rc4-mm1 did include blackfin-arch-balance-parenthesis-in-macros.patch, so I'm not sure what is going on here.

#2 lore raw
Quoted 8 lines · Andrew Morton
Quoted 4 lines · Bryan

1) Some issues are fixed according to LKML patch review.
2) Remove not supported BF535 code
3) Fixed some bugs from blackfin.uclinux.org SVN update Here is the updated patch for 2.6.21-rc4-mm1

Quoted 9 lines

1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/cplbinit.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/mach-bf535/bf535.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/scatterlist.h.rej

This seems to be against a kernel which did not include blackfin-arch-balance-parenthesis-in-macros.patch. But 2.6.21-rc4-mm1 did include blackfin-arch-balance-parenthesis-in-macros.patch, so I'm not sure what is going on here.

Sorry for this mess up. you know, as blackfin-arch-balance-parenthesis-in-macros.patch was posted, it was applied to our SVN tree. And I just merged these weeks SVN change to this update patch. So this patch includes blackfin-arch-balance-parenthesis-in-macros.patch.

Please hold on, after I fixed some issues according to Arnd and Paul's latest review, a new update patch will be sent.

Sorry for send a all-in-one update patch. Arnd and Paul gave lots' of good ideas about our last blackfin-arch.patch last time, and most of their request are applied in this days. So if I split the all-in-one update patch to small fix, there will be maybe 20 or 30 patches.

After this blackfin-arch-update.patch was merged to -mm, I will post small fixed patches as Arnd's advise.

Thanks
-Bryan Wu

#3 lore raw
Quoted 10 lines · Bryan
Quoted 9 lines

1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/cplbinit.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/mach-bf535/bf535.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/scatterlist.h.rej

This seems to be against a kernel which did not include blackfin-arch-balance-parenthesis-in-macros.patch. But 2.6.21-rc4-mm1 did include blackfin-arch-balance-parenthesis-in-macros.patch, so I'm not sure what is going on here.

Quoted 5 lines

Sorry for this mess up. you know, as blackfin-arch-balance-parenthesis-in-macros.patch was posted, it was applied to our SVN tree. And I just merged these weeks SVN change to this update patch. So this patch includes blackfin-arch-balance-parenthesis-in-macros.patch.

Well, you'd better get used to it. As I told you a few weeks ago, once this code is merged into mainline you no longer own the master copy of the blackfin tree - Linus does.

If you're not careful, you'll end up submitting patches which revert other
people's fixes. And there's an excellent chance that you will submit patches
which have dependencies on other stuff in your private tree and which are insufficiently-tested-against, and possibly incorrect-against Linus's tree.

#4 lore raw
Quoted 18 lines · Andrew Morton
Quoted 10 lines · Bryan
Quoted 9 lines

1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/cplbinit.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/mach-bf535/bf535.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-blackfin/scatterlist.h.rej

This seems to be against a kernel which did not include blackfin-arch-balance-parenthesis-in-macros.patch. But 2.6.21-rc4-mm1 did include blackfin-arch-balance-parenthesis-in-macros.patch, so I'm not sure what is going on here.

Quoted 5 lines

Sorry for this mess up. you know, as blackfin-arch-balance-parenthesis-in-macros.patch was posted, it was applied to our SVN tree. And I just merged these weeks SVN change to this update patch. So this patch includes blackfin-arch-balance-parenthesis-in-macros.patch.

Quoted 4 lines

Well, you'd better get used to it. As I told you a few weeks ago, once this code is merged into mainline you no longer own the master copy of the blackfin tree - Linus does.

We agree with this and please give us sometime to try to push our patches to the mainline tree. We still have tons of code should be submitted to mainline, and before the submission, the code should be reviewed and fixed. This is my main task and I think this internal review can reduce you and other kernel maintainer's effort.

But our team still have release pressure from customers. The whole distribution including bootloader/toolchain/kernel/uClinux-dist should be delivered to customers on time. If our kernel blackfin-arch are merged eventually, we definitely will move to linus tree and ask our customer to use linus mainline tree.

As you know, our latest U-Boot blackfin code is accepted by U-Boot upstream mainline recently. Then the internal U-Boot SVN tree will be replaced by upstream git-blackfin tree in U-Boot, our development will move to that mainline tree.

At this moment, I will try my best to speed up the blackfin-arch and drivers merge progress.

Quoted 4 lines

If you're not careful, you'll end up submitting patches which revert other
people's fixes. And there's an excellent chance that you will submit patches
which have dependencies on other stuff in your private tree and which are insufficiently-tested-against, and possibly incorrect-against Linus's tree.

Apologise. I will resend the blackfin update patch based on other patches.

Thanks Andrew
-Bryan Wu