linux-next: unnecessary merges in the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

I noticed that you have two unnecessary merges in the v4l-dvb tree
(git://linuxtv.org/mchehab/media-next.git#master).  This is not
entirely your fault.  Unfortunately, when you do

git merge <signed tag>

git will produce a merge commit even if it could have fast
forwarded :-(.  Consequently, you have commits 1ef24960ab78 ("Merge tag
'v3.18-rc1' into patchwork") and d6d41ba1cb38 ("Merge remote-tracking
branch 'linus/master' into patchwork") even though the patchwork branch
in each case is included in the tag being merged.

The only ways I know around this is to either merge the commit
associated with the tag or do a (hard) reset to the tag.

Linus, any thoughts?
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpYTytQBtCpV.pgp
Description: OpenPGP digital signature