linux-kernel - Re: linux-next: unnecessary merge in the ubifs tree

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: <1427353991.30360.87.camel@sauron.fi.intel.com>
Date:	Thu, 26 Mar 2015 09:13:11 +0200
From:	Artem Bityutskiy <dedekind1@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: unnecessary merge in the ubifs tree

On Thu, 2015-03-26 at 11:32 +1100, Stephen Rothwell wrote:
> Hi Artem,
> 
> I noticed merge commit 3527a86b7ae1 ("Merge tag 'v4.0-rc5' into
> linux-next").  Just a note that if you had merged the commit that the
> tag points to, you would have just had a fast forward instead of a
> "real" merge.  Merging the tag forces the --no-ff flag on git merge
> (and adding --ff does not change that).  You could have merged
> "v4.0-rc5^0" (I think) or (apparently) pass --ff-only to get the fast
> forward.

You are right, and thank you for telling about this. I hope Linus won't
flame me for this. I'll definitely keep this in mind next time.

Artem.


--
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/