From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f45.google.com ([74.125.82.45]:35278 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933061AbbEOOSA (ORCPT ); Fri, 15 May 2015 10:18:00 -0400 Received: by wghe15 with SMTP id e15so807747wgh.2 for ; Fri, 15 May 2015 07:17:59 -0700 (PDT) Message-ID: <55560015.9080604@suse.cz> Date: Fri, 15 May 2015 16:17:57 +0200 From: Jiri Slaby MIME-Version: 1.0 To: v1ron@mail.ru, Greg KH CC: stable , clemens@ladisch.de, Takashi Iwai Subject: ALSA: oxygen stable commit difference Content-Type: multipart/mixed; boundary="------------050003070409020509040503" Sender: stable-owner@vger.kernel.org List-ID: This is a multi-part message in MIME format. --------------050003070409020509040503 Content-Type: text/plain; charset=iso-8859-2 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, This: commit 1f91ecc14deea9461aca93273d78871ec4d98fcd Author: Roman Volkov 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. I am attaching version from upstream and from 3.12 for example. I have two questions: 1) why is it a totally different diff? 2) do we need the one below, which is marked as "Fixes" the above? commit 305564413c99514a14a49215790d96b8d71a6295 Author: Clemens Ladisch Date: Tue Mar 18 09:31:18 2014 +0100 ALSA: oxygen: Xonar DG(X): fix Stereo Upmixing regression thanks, - -- js suse labs -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVVgARAAoJEL0lsQQGtHBJjXAQAIACYbsS7GHJs0JxatW+ua6w MuiNmQqRQk6A5xvQ50mBnrBS7keD2vy7LhLA6yH/czCxwrJbxtEg+HNIEJ9hQ2T3 kMLlkxRXkMn4G3ajQL4x+Ne9FCvzOieYgpn/Jb27vLISyRNJpF9mv069CUk6qA2b IEaaQjuu9thF9yXw4zFUGzYC1vK2UqHdpl2Bi/rAmEfucLQHFgLFG6LGWfCnxv77 nBxEhds7OARnNhgJ5AW9gvv+fGQ8YoHCAFgxRIDrxzELV75BvlS4YZR/n72qb3s0 pX3EDiId62zkhvtu3H1zTbjRLunqf2rZISzcorcOvZniCsYnFkA2NQFHWCXbxG1Q 7LrRNeLktxYZ0NUjTqpchxJ26Tm1x6iIjHmgRmIdJoh/oL0Vgt4Tfna+jQvsJyOd fu9YVhLHp9uc+hgR+w3wL1VoiafeK9QlgxQ+m0ztKnp8hpN+TQBoaAEBkmlMG8uu 5/pI7STn2yHmzGZMWqlq6UgDSrFI/AeMD8RnEW24idtY4Aqb3gEIXnZq37LHQ4te mBJZJl4zr+HDJeznR2wSLs+ZtOUIVtfE1exF4Qqwg66r+aobbZ3wk+mI9njjt0L9 JwXneMXmK0nx6q8Jc6NFM0pRkOW/dE1HGFdw/naeKTACefl+LfR2ldr44+S7y7IZ isu5x2hPiMwKcFCf6/4e =S0ql -----END PGP SIGNATURE----- --------------050003070409020509040503 Content-Type: application/mbox; name="312.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="312.patch" RnJvbSA0NGM1ZDNmNGZhMjA3NTFhNTMyNzljYjkzYmU0ZTlhMjk3NGZjMDFhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSb21hbiBWb2xrb3YgPHYxcm9uQG1haWwucnU+CkRh dGU6IEZyaSwgMjQgSmFuIDIwMTQgMTY6MTg6MTEgKzA0MDAKU3ViamVjdDogW1BBVENIIDEv MV0gQUxTQTogb3h5Z2VuOiBtb2RpZnkgYWRqdXN0X2RnX2RhY19yb3V0aW5nIGZ1bmN0aW9u Cgpjb21taXQgMWY5MWVjYzE0ZGVlYTk0NjFhY2E5MzI3M2Q3ODg3MWVjNGQ5OGZjZCB1cHN0 cmVhbS4KCldoZW4gc2VsZWN0aW5nIHRoZSBhdWRpbyBvdXRwdXQgZGVzdGluYXRpb25zICho ZWFkcGhvbmVzLApGUCBoZWFkcGhvbmVzLCBtdWx0aWNoYW5uZWwgb3V0cHV0KSwgdGhlIGNo YW5uZWwgcm91dGluZwpzaG91bGQgYmUgY2hhbmdlZCBkZXBlbmRpbmcgb24gd2hhdCBkZXN0 aW5hdGlvbiBzZWxlY3RlZC4KQWxzbyB1bm5lY2Vzc2FyeSBJMlMgY2hhbm5lbHMgYXJlIGRp Z2l0YWxseSBtdXRlZC4gVGhpcwpmdW5jdGlvbiBjYWxsZWQgd2hlbiB0aGUgdXNlciBzZWxl Y3RzIHRoZSBkZXN0aW5hdGlvbgppbiB0aGUgQUxTQSBtaXhlci4KClNpZ25lZC1vZmYtYnk6 IFJvbWFuIFZvbGtvdiA8djFyb25AbWFpbC5ydT4KU2lnbmVkLW9mZi1ieTogQ2xlbWVucyBM YWRpc2NoIDxjbGVtZW5zQGxhZGlzY2guZGU+ClNpZ25lZC1vZmYtYnk6IEppcmkgU2xhYnkg PGpzbGFieUBzdXNlLmN6PgotLS0KIHNvdW5kL3BjaS9veHlnZW4veG9uYXJfZGcuYyB8IDEw ICsrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspCgpkaWZmIC0t Z2l0IGEvc291bmQvcGNpL294eWdlbi94b25hcl9kZy5jIGIvc291bmQvcGNpL294eWdlbi94 b25hcl9kZy5jCmluZGV4IDU1MTliOGYwZGFkMC4uZWI3YWQ3NzA2MjA1IDEwMDY0NAotLS0g YS9zb3VuZC9wY2kvb3h5Z2VuL3hvbmFyX2RnLmMKKysrIGIvc291bmQvcGNpL294eWdlbi94 b25hcl9kZy5jCkBAIC0yOTQsNiArMjk0LDE2IEBAIHN0YXRpYyBpbnQgb3V0cHV0X3N3aXRj aF9wdXQoc3RydWN0IHNuZF9rY29udHJvbCAqY3RsLAogCQlveHlnZW5fd3JpdGUxNl9tYXNr ZWQoY2hpcCwgT1hZR0VOX0dQSU9fREFUQSwKIAkJCQkgICAgICBkYXRhLT5vdXRwdXRfc2Vs ID09IDEgPyBHUElPX0hQX1JFQVIgOiAwLAogCQkJCSAgICAgIEdQSU9fSFBfUkVBUik7CisJ CW94eWdlbl93cml0ZThfbWFza2VkKGNoaXAsIE9YWUdFTl9QTEFZX1JPVVRJTkcsCisJCQkJ ICAgICBkYXRhLT5vdXRwdXRfc2VsID09IDAgPworCQkJCSAgICAgT1hZR0VOX1BMQVlfTVVU RTAxIDoKKwkJCQkgICAgIE9YWUdFTl9QTEFZX01VVEUyMyB8CisJCQkJICAgICBPWFlHRU5f UExBWV9NVVRFNDUgfAorCQkJCSAgICAgT1hZR0VOX1BMQVlfTVVURTY3LAorCQkJCSAgICAg T1hZR0VOX1BMQVlfTVVURTAxIHwKKwkJCQkgICAgIE9YWUdFTl9QTEFZX01VVEUyMyB8CisJ CQkJICAgICBPWFlHRU5fUExBWV9NVVRFNDUgfAorCQkJCSAgICAgT1hZR0VOX1BMQVlfTVVU RTY3KTsKIAl9CiAJbXV0ZXhfdW5sb2NrKCZjaGlwLT5tdXRleCk7CiAJcmV0dXJuIGNoYW5n ZWQ7Ci0tIAoyLjMuNwoK --------------050003070409020509040503 Content-Type: application/mbox; name="upstream.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="upstream.patch" RnJvbSAxZjkxZWNjMTRkZWVhOTQ2MWFjYTkzMjczZDc4ODcxZWM0ZDk4ZmNkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSb21hbiBWb2xrb3YgPHYxcm9uQG1haWwucnU+CkRh dGU6IEZyaSwgMjQgSmFuIDIwMTQgMTY6MTg6MTEgKzA0MDAKU3ViamVjdDogW1BBVENIIDEv MV0gQUxTQTogb3h5Z2VuOiBtb2RpZnkgYWRqdXN0X2RnX2RhY19yb3V0aW5nIGZ1bmN0aW9u CgpXaGVuIHNlbGVjdGluZyB0aGUgYXVkaW8gb3V0cHV0IGRlc3RpbmF0aW9ucyAoaGVhZHBo b25lcywKRlAgaGVhZHBob25lcywgbXVsdGljaGFubmVsIG91dHB1dCksIHRoZSBjaGFubmVs IHJvdXRpbmcKc2hvdWxkIGJlIGNoYW5nZWQgZGVwZW5kaW5nIG9uIHdoYXQgZGVzdGluYXRp b24gc2VsZWN0ZWQuCkFsc28gdW5uZWNlc3NhcnkgSTJTIGNoYW5uZWxzIGFyZSBkaWdpdGFs bHkgbXV0ZWQuIFRoaXMKZnVuY3Rpb24gY2FsbGVkIHdoZW4gdGhlIHVzZXIgc2VsZWN0cyB0 aGUgZGVzdGluYXRpb24KaW4gdGhlIEFMU0EgbWl4ZXIuCgpTaWduZWQtb2ZmLWJ5OiBSb21h biBWb2xrb3YgPHYxcm9uQG1haWwucnU+ClNpZ25lZC1vZmYtYnk6IENsZW1lbnMgTGFkaXNj aCA8Y2xlbWVuc0BsYWRpc2NoLmRlPgotLS0KIHNvdW5kL3BjaS9veHlnZW4veG9uYXJfZGcu YyB8IDQ0ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBz b3VuZC9wY2kvb3h5Z2VuL3hvbmFyX2RnLmggfCAgMiArKwogMiBmaWxlcyBjaGFuZ2VkLCAy MiBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zb3VuZC9w Y2kvb3h5Z2VuL3hvbmFyX2RnLmMgYi9zb3VuZC9wY2kvb3h5Z2VuL3hvbmFyX2RnLmMKaW5k ZXggODFjMDA0Yzc4NzY2Li4zMjlkYTU0MzQ1NTYgMTAwNjQ0Ci0tLSBhL3NvdW5kL3BjaS9v eHlnZW4veG9uYXJfZGcuYworKysgYi9zb3VuZC9wY2kvb3h5Z2VuL3hvbmFyX2RnLmMKQEAg LTI2MiwzMyArMjYyLDI5IEBAIHN0YXRpYyB2b2lkIHNldF9jczQyNDVfYWRjX3BhcmFtcyhz dHJ1Y3Qgb3h5Z2VuICpjaGlwLAogCWNzNDI0NV93cml0ZV9zcGkoY2hpcCwgQ1M0MjQ1X01D TEtfRlJFUSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgdW5zaWduZWQgaW50IHNoaWZ0X2JpdHMo dW5zaWduZWQgaW50IHZhbHVlLAotCQkJCSAgICAgIHVuc2lnbmVkIGludCBzaGlmdF9mcm9t LAotCQkJCSAgICAgIHVuc2lnbmVkIGludCBzaGlmdF90bywKLQkJCQkgICAgICB1bnNpZ25l ZCBpbnQgbWFzaykKLXsKLQlpZiAoc2hpZnRfZnJvbSA8IHNoaWZ0X3RvKQotCQlyZXR1cm4g KHZhbHVlIDw8IChzaGlmdF90byAtIHNoaWZ0X2Zyb20pKSAmIG1hc2s7Ci0JZWxzZQotCQly ZXR1cm4gKHZhbHVlID4+IChzaGlmdF9mcm9tIC0gc2hpZnRfdG8pKSAmIG1hc2s7Ci19Ci0K IHN0YXRpYyB1bnNpZ25lZCBpbnQgYWRqdXN0X2RnX2RhY19yb3V0aW5nKHN0cnVjdCBveHln ZW4gKmNoaXAsCiAJCQkJCSAgdW5zaWduZWQgaW50IHBsYXlfcm91dGluZykKIHsKLQlyZXR1 cm4gKHBsYXlfcm91dGluZyAmIE9YWUdFTl9QTEFZX0RBQzBfU09VUkNFX01BU0spIHwKLQkg ICAgICAgc2hpZnRfYml0cyhwbGF5X3JvdXRpbmcsCi0JCQkgIE9YWUdFTl9QTEFZX0RBQzJf U09VUkNFX1NISUZULAotCQkJICBPWFlHRU5fUExBWV9EQUMxX1NPVVJDRV9TSElGVCwKLQkJ CSAgT1hZR0VOX1BMQVlfREFDMV9TT1VSQ0VfTUFTSykgfAotCSAgICAgICBzaGlmdF9iaXRz KHBsYXlfcm91dGluZywKLQkJCSAgT1hZR0VOX1BMQVlfREFDMV9TT1VSQ0VfU0hJRlQsCi0J CQkgIE9YWUdFTl9QTEFZX0RBQzJfU09VUkNFX1NISUZULAotCQkJICBPWFlHRU5fUExBWV9E QUMyX1NPVVJDRV9NQVNLKSB8Ci0JICAgICAgIHNoaWZ0X2JpdHMocGxheV9yb3V0aW5nLAot CQkJICBPWFlHRU5fUExBWV9EQUMwX1NPVVJDRV9TSElGVCwKLQkJCSAgT1hZR0VOX1BMQVlf REFDM19TT1VSQ0VfU0hJRlQsCi0JCQkgIE9YWUdFTl9QTEFZX0RBQzNfU09VUkNFX01BU0sp OworCXN0cnVjdCBkZyAqZGF0YSA9IGNoaXAtPm1vZGVsX2RhdGE7CisJdW5zaWduZWQgaW50 IHJvdXRpbmcgPSAwOworCisJc3dpdGNoIChkYXRhLT5wY21fb3V0cHV0KSB7CisJY2FzZSBQ TEFZQkFDS19EU1RfSFA6CisJY2FzZSBQTEFZQkFDS19EU1RfSFBfRlA6CisJCW94eWdlbl93 cml0ZThfbWFza2VkKGNoaXAsIE9YWUdFTl9QTEFZX1JPVVRJTkcsCisJCQlPWFlHRU5fUExB WV9NVVRFMjMgfCBPWFlHRU5fUExBWV9NVVRFNDUgfAorCQkJT1hZR0VOX1BMQVlfTVVURTY3 LCBPWFlHRU5fUExBWV9NVVRFX01BU0spOworCQlicmVhazsKKwljYXNlIFBMQVlCQUNLX0RT VF9NVUxUSUNIOgorCQlyb3V0aW5nID0gKDAgPDwgT1hZR0VOX1BMQVlfREFDMF9TT1VSQ0Vf U0hJRlQpIHwKKwkJCSAgKDIgPDwgT1hZR0VOX1BMQVlfREFDMV9TT1VSQ0VfU0hJRlQpIHwK KwkJCSAgKDEgPDwgT1hZR0VOX1BMQVlfREFDMl9TT1VSQ0VfU0hJRlQpIHwKKwkJCSAgKDAg PDwgT1hZR0VOX1BMQVlfREFDM19TT1VSQ0VfU0hJRlQpOworCQlveHlnZW5fd3JpdGU4X21h c2tlZChjaGlwLCBPWFlHRU5fUExBWV9ST1VUSU5HLAorCQkJT1hZR0VOX1BMQVlfTVVURTAx LCBPWFlHRU5fUExBWV9NVVRFX01BU0spOworCQlicmVhazsKKwl9CisJcmV0dXJuIHJvdXRp bmc7CiB9CiAKIHN0YXRpYyBpbnQgb3V0cHV0X3N3aXRjaF9pbmZvKHN0cnVjdCBzbmRfa2Nv bnRyb2wgKmN0bCwKZGlmZiAtLWdpdCBhL3NvdW5kL3BjaS9veHlnZW4veG9uYXJfZGcuaCBi L3NvdW5kL3BjaS9veHlnZW4veG9uYXJfZGcuaAppbmRleCA5NDQ2ODVlZGZjZTQuLmE5ZmJh NDBiYzAxMyAxMDA2NDQKLS0tIGEvc291bmQvcGNpL294eWdlbi94b25hcl9kZy5oCisrKyBi L3NvdW5kL3BjaS9veHlnZW4veG9uYXJfZGcuaApAQCAtMjYsNiArMjYsOCBAQCBlbnVtIGNz NDI0NV9zaGFkb3dfb3BlcmF0aW9uIHsKIHN0cnVjdCBkZyB7CiAJLyogc2hhZG93IGNvcHkg b2YgdGhlIENTNDI0NSByZWdpc3RlciBzcGFjZSAqLwogCXVuc2lnbmVkIGNoYXIgY3M0MjQ1 X3NoYWRvd1sxN107CisJLyogb3V0cHV0IHNlbGVjdDogaGVhZHBob25lL3NwZWFrZXJzICov CisJdW5zaWduZWQgY2hhciBwY21fb3V0cHV0OwogCXVuc2lnbmVkIGludCBvdXRwdXRfc2Vs OwogCXM4IGlucHV0X3ZvbFs0XVsyXTsKIAl1bnNpZ25lZCBpbnQgaW5wdXRfc2VsOwotLSAK Mi4zLjcKCg== --------------050003070409020509040503--