Jiri Slaby wrote: > This: > commit 1f91ecc14deea9461aca93273d78871ec4d98fcd > Author: Roman Volkov <v1ron@xxxxxxx> > Date: Fri Jan 24 16:18:11 2014 +0400 > > ALSA: oxygen: modify adjust_dg_dac_routing function > > was merged in 3.14 and was also put to several stable trees back in > early 2014. But the commit in stable trees is totally different to > what is in upstream. > > 1) why is it a totally different diff? The upstream commit was part of a larger reorganization and depended on lots of earlier changes. The OXYGEN_PLAY_MUTE* changes are the correct backport for the old driver; the OXYGEN_PLAY_DACx_SOURCE* changes would have been meaningless in the old driver. It was an error to not mention this in the stable commit message. > 2) do we need the one below, which is marked as "Fixes" the above? > > commit 305564413c99514a14a49215790d96b8d71a6295 > Author: Clemens Ladisch <clemens@xxxxxxxxxx> > Date: Tue Mar 18 09:31:18 2014 +0100 > > ALSA: oxygen: Xonar DG(X): fix Stereo Upmixing regression This reverts exactly those parts that were not backported to -stable, so it must not (and cannot) be applied to -stable. Regards, Clemens -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html