On Wed, 2007-03-21 at 20:08 -0800, Andrew Morton wrote: > On Thu, 22 Mar 2007 10:24:51 +0800 "Wu, Bryan" <[EMAIL PROTECTED]> wrote: > > > > 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. > > 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. > 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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
