[GIT PULL] Samsung devel for v3.3
arnd at arndb.de
Mon Jan 9 10:56:34 EST 2012
On Monday 09 January 2012, Kukjin Kim wrote:
> In my opinion, as you know, it would be better to us if you could send this in
> this merge window.
> Actually, it does not have any dependency with others, in addition, for a long
> time this has been included in linux-next for this
> merge window.
Your patches have caused too much problems already so far, with many complex
merges (multiple files combined into new files in the restart branch, but
modified in multiple other conflicting branches), and I would rather not
see *anything* besides fixes from you for late 3.3 patches. If it hadn't
been for the conflicts I mentioned, everything else from arm-soc could
have been sent last Saturday already, but this way I spent a national
holiday and a weekend day, both during my vacation, mostly trying to
understand what you were trying to do and get it into shape for upstream
submission, giving up in the end.
I don't consider it enough to have patches in linux-next before the merge
window, and I thought I had made it clear enough that everything has to be
in arm-soc before the merge window. I realize that sometimes there is stuff
that gets done last minute and really has to get merged, but since you have
had it in your own tree for so long, that certainly doesn't apply here.
> If this can be missed from sending list to Linus, please kindly let me know.
Sorry, but the chances are pretty slim this time.
> Let me send this to Linus at the end of this merge window.
No, if you do this, I will NAK that pull request.
Of course we will take all bug fixes. Just rebase the rest on top of 3.3-rc1
and we can take it right away for 3.4.
More information about the linux-arm-kernel