From: "Theodore Ts'o" <tytso@mit.edu>
To: Bob Liu <lliubbo@gmail.com>
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
uclinux-dist-devel@blackfin.uclinux.org, vapier@gentoo.org,
sonic.zhang@analog.com
Subject: Re: [GIT PULL v2] Blackfin changes for 3.6-rc1
Date: Tue, 24 Jul 2012 15:21:20 -0400 [thread overview]
Message-ID: <20120724192120.GB29239@thunk.org> (raw)
In-Reply-To: <1343109280-22653-1-git-send-email-lliubbo@gmail.com>
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
next prev parent reply other threads:[~2012-07-24 19:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-24 5:54 Bob Liu
2012-07-24 16:47 ` Linus Torvalds
2012-07-24 19:21 ` Theodore Ts'o [this message]
2012-07-25 13:09 ` Bob Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120724192120.GB29239@thunk.org \
--to=tytso@mit.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=lliubbo@gmail.com \
--cc=sonic.zhang@analog.com \
--cc=torvalds@linux-foundation.org \
--cc=uclinux-dist-devel@blackfin.uclinux.org \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®