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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAA_GA1eYnwF3ObT7Y7DGj2G83nzkyZ7efkM3_JWvASOQkPW9Yg@mail.gmail.com>
Date:	Wed, 25 Jul 2012 21:09:02 +0800
From:	Bob Liu <lliubbo@...il.com>
To:	"Theodore Ts'o" <tytso@....edu>, Bob Liu <lliubbo@...il.com>,
	torvalds@...ux-foundation.org, linux-kernel@...r.kernel.org,
	uclinux-dist-devel@...ckfin.uclinux.org, vapier@...too.org,
	sonic.zhang@...log.com
Subject: Re: [GIT PULL v2] Blackfin changes for 3.6-rc1

On Wed, Jul 25, 2012 at 3:21 AM, Theodore Ts'o <tytso@....edu> wrote:
> 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.
>

Got it, thanks a lot for your kindly explanation.

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