Re: [GIT PULL v2] Blackfin changes for 3.6-rc1

[Theodore Ts'o]

On Tue, Jul 24, 2012 at 01:54:40PM +0800, Bob Liu wrote:
> 
> This is the new pull request about blackfin changes for 3.6-rc1.
> I've rebased my tree to 3.5.

To save Linus having to send you a chastising e-mail (and because I'll
probably be more gentle about it than he would be :-), in general it's
good not to rebase your the tree before submitting to Linus.  If you
tested with your set of commits pon top of 3.5-rc3, then submit those
patches that way.  Rebasing at least partially invalidates your
testing, and causes other problems if someone else has based their
tree off of yours.

If the goal is to avoid merge conflicts, it's better to just resolve
the conflict, and push the proposed merge resolution, and send Linus
both the commit pre-merge, and post-merge, and let him decide if wants
to use your merge resolution, or to fix things up in a slightly
different way.

Regards,

						- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/