[akmods: 3/3] Merge branch 'el7'

[Dominik 'Rathann' Mierzejewski]

On Wednesday, 23 November 2016 at 13:40, Nicolas Chauvet wrote:
> 2016-11-23 0:38 GMT+01:00 Sérgio M. Basto <sergiomb at rpmfusion.org>:
> > commit 580f919341f903be8383f4159a5b47b3d0c78dd2
> > Merge: 3673a38 2d1568a
> > Author: Sérgio M. Basto <sergio at serjux.com>
> > Date:   Tue Nov 22 23:35:20 2016 +0000
> >
> >     Merge branch 'el7'
> HOW IS THAT even possible that you merge back and forth el7 branch to devel.
> STOP doing that this is totally insane!

Only fast-forward merges should be done from non-master branches to
master. Otherwise we're getting junk "merge commits" unnecessarily.

Regards,
Dominik
-- 
Fedora http://fedoraproject.org/wiki/User:Rathann
RPMFusion http://rpmfusion.org
"Faith manages."
        -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"