On Tue, Apr 07, 2009 at 11:45:33PM -0500, Felix Blyakher wrote:
> On Apr 6, 2009, at 5:28 PM, Christoph Hellwig wrote:
>> I've sucked these patches into my tree after reviewin and QAing them.
>> Felix, can you pull this and send it to Linus for 2.6.30?
> I did pull from your tree, and pushed to oss.
> But I stopped short from pushing the for-linus branch,
> and generating the pull request, as I'm again seeing
> the 'merge' commits. I'll try to sort it out tomorrow.
Note that you will always see some merge commits of both merged trees
touched the same files. What Linus objected was the large amount of
merge commits. The way to bring them down is to simply do less merges,
just stay on the same mainline level for a longer time and only merge
with mainline short before you prepare a pull or when you really need it
due to conflicting changes making it in.