Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754158Ab3COKVs (ORCPT ); Fri, 15 Mar 2013 06:21:48 -0400 Received: from mail-we0-f172.google.com ([74.125.82.172]:44841 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753282Ab3COKVq (ORCPT ); Fri, 15 Mar 2013 06:21:46 -0400 MIME-Version: 1.0 Reply-To: sedat.dilek@gmail.com In-Reply-To: <87li9ptgtq.fsf@rustcorp.com.au> References: <20130314172737.2856af8a9b368bc395d977be@canb.auug.org.au> <87li9ptgtq.fsf@rustcorp.com.au> Date: Fri, 15 Mar 2013 11:21:43 +0100 Message-ID: Subject: Re: linux-next: manual merge of the signal tree with the modules tree From: Sedat Dilek To: Rusty Russell Cc: Stephen Rothwell , Al Viro , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: multipart/mixed; boundary=f46d0444e97f814f0a04d7f4011a Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 42754 Lines: 601 --f46d0444e97f814f0a04d7f4011a Content-Type: text/plain; charset=UTF-8 On Fri, Mar 15, 2013 at 5:41 AM, Rusty Russell wrote: > Stephen Rothwell writes: >> Hi Al, >> >> Today's linux-next merge of the signal tree got a conflict in >> include/asm-generic/unistd.h between commit 837718bfd28b >> ("CONFIG_SYMBOL_PREFIX: cleanup") from the modules tree and commit >> e1b5bb6d1236 ("consolidate cond_syscall and SYSCALL_ALIAS declarations") >> from the signal tree. >> >> The latter moved the cond_syscall stuff to linkage.h, so I applied the >> following patch as a merge fixup and can carry the fix as necessary (no >> action is required). I am not sure if this is completely correct or all >> that is needed. > > Your fix looks correct, thanks. > > I've been forced to update that patch after another round of > improvements, so you may need to re-do the merge. > Hi, I just looked into modules-next... The improved version is in [1]... ...and contains a file called "kernel/modsign_certificate.S" which is NOT in the latest Linux-Next tree [2]. So, I thought about reverting the one in -next and apply the new one from modules-next. This is not possible! $ git log --oneline -2 d98f244 Merge tag 'next-20130315' of git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next into Linux-Next-v20130315 1765898 Add linux-next specific files for 20130315 $ LC_ALL=C ls -l kernel/mod* -rw-r--r-- 1 wearefam wearefam 458 Mar 15 11:13 kernel/module-internal.h -rw-r--r-- 1 wearefam wearefam 99000 Mar 15 11:13 kernel/module.c -rw-r--r-- 1 wearefam wearefam 6063 Mar 15 11:13 kernel/module_signing.c Is this a generated file? I have attached both patches extracted from Linux-Next [3] and modules-next [4]. Both patches list changes to "kernel/modsign_certificate.S". /me ---> confused! Can you please enlighten me? Regards, - Sedat - [1] http://git.kernel.org/cgit/linux/kernel/git/rusty/linux.git/commit/?h=modules-next&id=b92021b09df70c1609e3547f3d6128dd560be97f [2] http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/kernel?id=next-20130315 [3] http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/patch/?id=837718bfd28ba5f474c1182ef2639b6949d854fc [4] http://git.kernel.org/cgit/linux/kernel/git/rusty/linux.git/patch/?id=b92021b09df70c1609e3547f3d6128dd560be97f > Cheers, > Rusty. > -- > To unsubscribe from this list: send the line "unsubscribe linux-next" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html --f46d0444e97f814f0a04d7f4011a Content-Type: application/octet-stream; name="CONFIG_SYMBOL_PREFIX-cleanup-from-modules-next.patch" Content-Disposition: attachment; filename="CONFIG_SYMBOL_PREFIX-cleanup-from-modules-next.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_heb731tw0 RnJvbSBiOTIwMjFiMDlkZjcwYzE2MDllMzU0N2YzZDYxMjhkZDU2MGJlOTdmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSdXN0eSBSdXNzZWxsIDxydXN0eUBydXN0Y29ycC5jb20uYXU+ CkRhdGU6IEZyaSwgMTUgTWFyIDIwMTMgMDQ6MzQ6MTcgKzAwMDAKU3ViamVjdDogQ09ORklHX1NZ TUJPTF9QUkVGSVg6IGNsZWFudXAuCgpXZSBoYXZlIENPTkZJR19TWU1CT0xfUFJFRklYLCB3aGlj aCB0aHJlZSBhcmNocyBkZWZpbmUgdG8gdGhlIHN0cmluZwoiXyIuICBCdXQgQWwgVmlybyBicm9r ZSB0aGlzIGluICJjb25zb2xpZGF0ZSBjb25kX3N5c2NhbGwgYW5kClNZU0NBTExfQUxJQVMgZGVj bGFyYXRpb25zIiAoaW4gbGludXgtbmV4dCksIGFuZCBoZSdzIG5vdCB0aGUgZmlyc3QgdG8KZG8g c28uCgpVc2luZyBDT05GSUdfU1lNQk9MX1BSRUZJWCBpcyBhd2t3YXJkLCBzaW5jZSB3ZSB1c3Vh bGx5IGp1c3Qgd2FudCB0bwpwcmVmaXggaXQgc28gc29tZXRoaW5nLiAgU28gdmFyaW91cyBwbGFj ZXMgZGVmaW5lIGhlbHBlcnMgd2hpY2ggYXJlCmRlZmluZWQgdG8gbm90aGluZyBpZiBDT05GSUdf U1lNQk9MX1BSRUZJWCBpc24ndCBzZXQ6CgoxKSBpbmNsdWRlL2FzbS1nZW5lcmljL3VuaXN0ZC5o IGRlZmluZXMgX19TWU1CT0xfUFJFRklYLgoyKSBpbmNsdWRlL2FzbS1nZW5lcmljL3ZtbGludXgu bGRzLmggZGVmaW5lcyBWTUxJTlVYX1NZTUJPTChzeW0pCjMpIGluY2x1ZGUvbGludXgvZXhwb3J0 LmggZGVmaW5lcyBNT0RVTEVfU1lNQk9MX1BSRUZJWC4KNCkgaW5jbHVkZS9saW51eC9rZXJuZWwu aCBkZWZpbmVzIFNZTUJPTF9QUkVGSVggKHdoaWNoIGRpZmZlcnMgZnJvbSAjNykKNSkga2VybmVs L21vZHNpZ25fY2VydGlmaWNhdGUuUyBkZWZpbmVzIEFTTV9TWU1CT0woc3ltKQo2KSBzY3JpcHRz L21vZHBvc3QuYyBkZWZpbmVzIE1PRFVMRV9TWU1CT0xfUFJFRklYCjcpIHNjcmlwdHMvTWFrZWZp bGUubGliIGRlZmluZXMgU1lNQk9MX1BSRUZJWCBvbiB0aGUgY29tbWFuZGxpbmUgaWYKICAgQ09O RklHX1NZTUJPTF9QUkVGSVggaXMgc2V0LCBzbyB0aGF0IHdlIGhhdmUgYSBub24tc3RyaW5nIHZl cnNpb24KICAgZm9yIHBhc3RpbmcuCgooYXJjaC9oODMwMC9pbmNsdWRlL2FzbS9saW5rYWdlLmgg ZGVmaW5lcyBTWU1CT0xfTkFNRSgpLCB0b28pLgoKTGV0J3Mgc29sdmUgdGhpcyBwcm9wZXJseToK MSkgTm8gbW9yZSBnZW5lcmljIHByZWZpeCwganVzdCBDT05GSUdfSEFWRV9VTkRFUlNDT1JFX1NZ TUJPTF9QUkVGSVguCjIpIE1ha2UgbGludXgvZXhwb3J0LmggdXNhYmxlIGZyb20gYXNtLgozKSBE ZWZpbmUgVk1MSU5VWF9TWU1CT0woKSBhbmQgVk1MSU5VWF9TWU1CT0xfU1RSKCkuCjQpIE1ha2Ug ZXZlcnlvbmUgdXNlIHRoZW0uCgpTaWduZWQtb2ZmLWJ5OiBSdXN0eSBSdXNzZWxsIDxydXN0eUBy dXN0Y29ycC5jb20uYXU+ClJldmlld2VkLWJ5OiBKYW1lcyBIb2dhbiA8amFtZXMuaG9nYW5AaW1n dGVjLmNvbT4KVGVzdGVkLWJ5OiBKYW1lcyBIb2dhbiA8amFtZXMuaG9nYW5AaW1ndGVjLmNvbT4g KG1ldGFnKQotLS0KZGlmZiAtLWdpdCBhL01ha2VmaWxlIGIvTWFrZWZpbGUKaW5kZXggYTA1ZWE0 Mi4uMGIwOWJhNSAxMDA2NDQKLS0tIGEvTWFrZWZpbGUKKysrIGIvTWFrZWZpbGUKQEAgLTEzOTgs NyArMTM5OCw3IEBAIHF1aWV0X2NtZF9ybWZpbGVzID0gJChpZiAkKHdpbGRjYXJkICQocm0tZmls ZXMpKSxDTEVBTiAgICQod2lsZGNhcmQgJChybS1maWxlcykpCiAjIFJ1biBkZXBtb2Qgb25seSBp ZiB3ZSBoYXZlIFN5c3RlbS5tYXAgYW5kIGRlcG1vZCBpcyBleGVjdXRhYmxlCiBxdWlldF9jbWRf ZGVwbW9kID0gREVQTU9EICAkKEtFUk5FTFJFTEVBU0UpCiAgICAgICBjbWRfZGVwbW9kID0gJChD T05GSUdfU0hFTEwpICQoc3JjdHJlZSkvc2NyaXB0cy9kZXBtb2Quc2ggJChERVBNT0QpIFwKLSAg ICAgICAgICAgICAgICAgICAkKEtFUk5FTFJFTEVBU0UpICIkKHBhdHN1YnN0ICIlIiwlLCQoQ09O RklHX1NZTUJPTF9QUkVGSVgpKSIKKyAgICAgICAgICAgICAgICAgICAkKEtFUk5FTFJFTEVBU0Up ICIkKHBhdHN1YnN0IHksXywkKENPTkZJR19IQVZFX1VOREVSU0NPUkVfU1lNQk9MX1BSRUZJWCkp IgogCiAjIENyZWF0ZSB0ZW1wb3JhcnkgZGlyIGZvciBtb2R1bGUgc3VwcG9ydCBmaWxlcwogIyBj bGVhbiBpdCB1cCBvbmx5IHdoZW4gYnVpbGRpbmcgYWxsIG1vZHVsZXMKZGlmZiAtLWdpdCBhL2Fy Y2gvS2NvbmZpZyBiL2FyY2gvS2NvbmZpZwppbmRleCAxNDU1NTc5Li43YjQzM2E0IDEwMDY0NAot LS0gYS9hcmNoL0tjb25maWcKKysrIGIvYXJjaC9LY29uZmlnCkBAIC0zODQsNiArMzg0LDEyIEBA IGNvbmZpZyBNT0RVTEVTX1VTRV9FTEZfUkVMCiAJICBNb2R1bGVzIG9ubHkgdXNlIEVMRiBSRUwg cmVsb2NhdGlvbnMuICBNb2R1bGVzIHdpdGggRUxGIFJFTEEKIAkgIHJlbG9jYXRpb25zIHdpbGwg Z2l2ZSBhbiBlcnJvci4KIAorY29uZmlnIEhBVkVfVU5ERVJTQ09SRV9TWU1CT0xfUFJFRklYCisJ Ym9vbAorCWhlbHAKKwkgIFNvbWUgYXJjaGl0ZWN0dXJlcyBnZW5lcmF0ZSBhbiBfIGluIGZyb250 IG9mIEMgc3ltYm9sczsgdGhpbmdzIGxpa2UKKwkgIG1vZHVsZSBsb2FkaW5nIGFuZCBhc3NlbWJs eSBmaWxlcyBuZWVkIHRvIGtub3cgYWJvdXQgdGhpcy4KKwogIwogIyBBQkkgaGFsbCBvZiBzaGFt ZQogIwpkaWZmIC0tZ2l0IGEvYXJjaC9ibGFja2Zpbi9LY29uZmlnIGIvYXJjaC9ibGFja2Zpbi9L Y29uZmlnCmluZGV4IGMzZjJlMGIuLjQ1M2ViZTQgMTAwNjQ0Ci0tLSBhL2FyY2gvYmxhY2tmaW4v S2NvbmZpZworKysgYi9hcmNoL2JsYWNrZmluL0tjb25maWcKQEAgLTEsNyArMSwzIEBACi1jb25m aWcgU1lNQk9MX1BSRUZJWAotCXN0cmluZwotCWRlZmF1bHQgIl8iCi0KIGNvbmZpZyBNTVUKIAlk ZWZfYm9vbCBuCiAKQEAgLTMzLDYgKzI5LDcgQEAgY29uZmlnIEJMQUNLRklOCiAJc2VsZWN0IEFS Q0hfSEFWRV9DVVNUT01fR1BJT19ICiAJc2VsZWN0IEFSQ0hfV0FOVF9PUFRJT05BTF9HUElPTElC CiAJc2VsZWN0IEhBVkVfVUlEMTYKKwlzZWxlY3QgSEFWRV9VTkRFUlNDT1JFX1NZTUJPTF9QUkVG SVgKIAlzZWxlY3QgVklSVF9UT19CVVMKIAlzZWxlY3QgQVJDSF9XQU5UX0lQQ19QQVJTRV9WRVJT SU9OCiAJc2VsZWN0IEhBVkVfR0VORVJJQ19IQVJESVJRUwpkaWZmIC0tZ2l0IGEvYXJjaC9oODMw MC9LY29uZmlnIGIvYXJjaC9oODMwMC9LY29uZmlnCmluZGV4IDc5MjUwZGUuLjMwM2U0ZjkgMTAw NjQ0Ci0tLSBhL2FyY2gvaDgzMDAvS2NvbmZpZworKysgYi9hcmNoL2g4MzAwL0tjb25maWcKQEAg LTEyLDEwICsxMiw3IEBAIGNvbmZpZyBIODMwMAogCXNlbGVjdCBNT0RVTEVTX1VTRV9FTEZfUkVM QQogCXNlbGVjdCBPTERfU0lHU1VTUEVORDMKIAlzZWxlY3QgT0xEX1NJR0FDVElPTgotCi1jb25m aWcgU1lNQk9MX1BSRUZJWAotCXN0cmluZwotCWRlZmF1bHQgIl8iCisJc2VsZWN0IEhBVkVfVU5E RVJTQ09SRV9TWU1CT0xfUFJFRklYCiAKIGNvbmZpZyBNTVUKIAlib29sCmRpZmYgLS1naXQgYS9h cmNoL21ldGFnL0tjb25maWcgYi9hcmNoL21ldGFnL0tjb25maWcKaW5kZXggYWZjODk3My4uMjA5 OTYxNyAxMDA2NDQKLS0tIGEvYXJjaC9tZXRhZy9LY29uZmlnCisrKyBiL2FyY2gvbWV0YWcvS2Nv bmZpZwpAQCAtMSw3ICsxLDMgQEAKLWNvbmZpZyBTWU1CT0xfUFJFRklYCi0Jc3RyaW5nCi0JZGVm YXVsdCAiXyIKLQogY29uZmlnIE1FVEFHCiAJZGVmX2Jvb2wgeQogCXNlbGVjdCBFTUJFRERFRApA QCAtMjcsNiArMjMsNyBAQCBjb25maWcgTUVUQUcKIAlzZWxlY3QgSEFWRV9NT0RfQVJDSF9TUEVD SUZJQwogCXNlbGVjdCBIQVZFX1BFUkZfRVZFTlRTCiAJc2VsZWN0IEhBVkVfU1lTQ0FMTF9UUkFD RVBPSU5UUworCXNlbGVjdCBIQVZFX1VOREVSU0NPUkVfU1lNQk9MX1BSRUZJWAogCXNlbGVjdCBJ UlFfRE9NQUlOCiAJc2VsZWN0IE1PRFVMRVNfVVNFX0VMRl9SRUxBCiAJc2VsZWN0IE9GCmRpZmYg LS1naXQgYS9kcml2ZXJzL210ZC9jaGlwcy9nZW5fcHJvYmUuYyBiL2RyaXZlcnMvbXRkL2NoaXBz L2dlbl9wcm9iZS5jCmluZGV4IDNiOWEyODQuLjc0ZGJiNmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv bXRkL2NoaXBzL2dlbl9wcm9iZS5jCisrKyBiL2RyaXZlcnMvbXRkL2NoaXBzL2dlbl9wcm9iZS5j CkBAIC0yMDQsMTQgKzIwNCwxNiBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBtdGRfaW5mbyAqY2Zp X2NtZHNldF91bmtub3duKHN0cnVjdCBtYXBfaW5mbyAqbWFwLAogCXN0cnVjdCBjZmlfcHJpdmF0 ZSAqY2ZpID0gbWFwLT5mbGRydl9wcml2OwogCV9fdTE2IHR5cGUgPSBwcmltYXJ5P2NmaS0+Y2Zp cS0+UF9JRDpjZmktPmNmaXEtPkFfSUQ7CiAjaWZkZWYgQ09ORklHX01PRFVMRVMKLQljaGFyIHBy b2JlbmFtZVsxNitzaXplb2YoTU9EVUxFX1NZTUJPTF9QUkVGSVgpXTsKKwljaGFyIHByb2JlbmFt ZVtzaXplb2YoVk1MSU5VWF9TWU1CT0xfU1RSKGNmaV9jbWRzZXRfJTQuNFgpKV07CiAJY2ZpX2Nt ZHNldF9mbl90ICpwcm9iZV9mdW5jdGlvbjsKIAotCXNwcmludGYocHJvYmVuYW1lLCBNT0RVTEVf U1lNQk9MX1BSRUZJWCAiY2ZpX2NtZHNldF8lNC40WCIsIHR5cGUpOworCXNwcmludGYocHJvYmVu YW1lLCBWTUxJTlVYX1NZTUJPTF9TVFIoY2ZpX2NtZHNldF8lNC40WCksIHR5cGUpOwogCiAJcHJv YmVfZnVuY3Rpb24gPSBfX3N5bWJvbF9nZXQocHJvYmVuYW1lKTsKIAlpZiAoIXByb2JlX2Z1bmN0 aW9uKSB7Ci0JCXJlcXVlc3RfbW9kdWxlKHByb2JlbmFtZSArIHNpemVvZihNT0RVTEVfU1lNQk9M X1BSRUZJWCkgLSAxKTsKKwkJY2hhciBtb2RuYW1lW3NpemVvZigiY2ZpX2NtZHNldF8lNC40WCIp XTsKKwkJc3ByaW50Zihtb2RuYW1lLCAiY2ZpX2NtZHNldF8lNC40WCIsIHR5cGUpOworCQlyZXF1 ZXN0X21vZHVsZShtb2RuYW1lKTsKIAkJcHJvYmVfZnVuY3Rpb24gPSBfX3N5bWJvbF9nZXQocHJv YmVuYW1lKTsKIAl9CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvYXNtLWdlbmVyaWMvdW5pc3RkLmgg Yi9pbmNsdWRlL2FzbS1nZW5lcmljL3VuaXN0ZC5oCmluZGV4IDQwNzdiNWQuLjE1YzA1OTggMTAw NjQ0Ci0tLSBhL2luY2x1ZGUvYXNtLWdlbmVyaWMvdW5pc3RkLmgKKysrIGIvaW5jbHVkZS9hc20t Z2VuZXJpYy91bmlzdGQuaApAQCAtMSw0ICsxLDUgQEAKICNpbmNsdWRlIDx1YXBpL2FzbS1nZW5l cmljL3VuaXN0ZC5oPgorI2luY2x1ZGUgPGxpbnV4L2V4cG9ydC5oPgogCiAvKgogICogVGhlc2Ug YXJlIHJlcXVpcmVkIHN5c3RlbSBjYWxscywgd2Ugc2hvdWxkCkBAIC0xNywxMiArMTgsNyBAQAog ICogYnV0IGl0IGRvZXNuJ3Qgd29yayBvbiBhbGwgdG9vbGNoYWlucywgc28gd2UganVzdCBkbyBp dCBieSBoYW5kCiAgKi8KICNpZm5kZWYgY29uZF9zeXNjYWxsCi0jaWZkZWYgQ09ORklHX1NZTUJP TF9QUkVGSVgKLSNkZWZpbmUgX19TWU1CT0xfUFJFRklYIENPTkZJR19TWU1CT0xfUFJFRklYCi0j ZWxzZQotI2RlZmluZSBfX1NZTUJPTF9QUkVGSVgKLSNlbmRpZgotI2RlZmluZSBjb25kX3N5c2Nh bGwoeCkgYXNtKCIud2Vha1x0IiBfX1NZTUJPTF9QUkVGSVggI3ggIlxuXHQiIFwKLQkJCSAgICAi LnNldFx0IiBfX1NZTUJPTF9QUkVGSVggI3ggIiwiIFwKLQkJCSAgICBfX1NZTUJPTF9QUkVGSVgg InN5c19uaV9zeXNjYWxsIikKKyNkZWZpbmUgY29uZF9zeXNjYWxsKHgpIGFzbSgiLndlYWtcdCIg Vk1MSU5VWF9TWU1CT0xfU1RSKHgpICJcblx0IglcCisJCQkgICAgIi5zZXRcdCIgVk1MSU5VWF9T WU1CT0xfU1RSKHgpICIsIglcCisJCQkgICAgVk1MSU5VWF9TWU1CT0xfU1RSKHN5c19uaV9zeXNj YWxsKSkKICNlbmRpZgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9hc20tZ2VuZXJpYy92bWxpbnV4Lmxk cy5oIGIvaW5jbHVkZS9hc20tZ2VuZXJpYy92bWxpbnV4Lmxkcy5oCmluZGV4IGFmYTEyYzcuLmVi NThkMmQgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5sZHMuaAorKysg Yi9pbmNsdWRlL2FzbS1nZW5lcmljL3ZtbGludXgubGRzLmgKQEAgLTUyLDEzICs1Miw3IEBACiAj ZGVmaW5lIExPQURfT0ZGU0VUIDAKICNlbmRpZgogCi0jaWZuZGVmIFNZTUJPTF9QUkVGSVgKLSNk ZWZpbmUgVk1MSU5VWF9TWU1CT0woc3ltKSBzeW0KLSNlbHNlCi0jZGVmaW5lIFBBU1RFMih4LHkp IHgjI3kKLSNkZWZpbmUgUEFTVEUoeCx5KSBQQVNURTIoeCx5KQotI2RlZmluZSBWTUxJTlVYX1NZ TUJPTChzeW0pIFBBU1RFKFNZTUJPTF9QUkVGSVgsIHN5bSkKLSNlbmRpZgorI2luY2x1ZGUgPGxp bnV4L2V4cG9ydC5oPgogCiAvKiBBbGlnbiAuIHRvIGEgOCBieXRlIGJvdW5kYXJ5IGVxdWFscyB0 byBtYXhpbXVtIGZ1bmN0aW9uIGFsaWdubWVudC4gKi8KICNkZWZpbmUgQUxJR05fRlVOQ1RJT04o KSAgLiA9IEFMSUdOKDgpCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2V4cG9ydC5oIGIvaW5j bHVkZS9saW51eC9leHBvcnQuaAppbmRleCA2OTZjMGY0Li40MTJjZDUwIDEwMDY0NAotLS0gYS9p bmNsdWRlL2xpbnV4L2V4cG9ydC5oCisrKyBiL2luY2x1ZGUvbGludXgvZXhwb3J0LmgKQEAgLTUs MTcgKzUsMjQgQEAKICAqIHRvIHJlZHVjZSB0aGUgYW1vdW50IG9mIHBvaW50bGVzcyBjcnVmdCB3 ZSBmZWVkIHRvIGdjYyB3aGVuIG9ubHkKICAqIGV4cG9ydGluZyBhIHNpbXBsZSBzeW1ib2wgb3Ig dHdvLgogICoKLSAqIElmIHlvdSBmZWVsIHRoZSBuZWVkIHRvIGFkZCAjaW5jbHVkZSA8bGludXgv Zm9vLmg+IHRvIHRoaXMgZmlsZQotICogdGhlbiB5b3UgYXJlIGRvaW5nIHNvbWV0aGluZyB3cm9u ZyBhbmQgc2hvdWxkIGdvIGF3YXkgc2lsZW50bHkuCisgKiBUcnkgbm90IHRvIGFkZCAjaW5jbHVk ZXMgaGVyZS4gIEl0IHNsb3dzIGNvbXBpbGF0aW9uIGFuZCBtYWtlcyBrZXJuZWwKKyAqIGhhY2tl cnMgcGxhY2UgZ3J1bXB5IGNvbW1lbnRzIGluIGhlYWRlciBmaWxlcy4KICAqLwogCiAvKiBTb21l IHRvb2xjaGFpbnMgdXNlIGEgYF8nIHByZWZpeCBmb3IgYWxsIHVzZXIgc3ltYm9scy4gKi8KLSNp ZmRlZiBDT05GSUdfU1lNQk9MX1BSRUZJWAotI2RlZmluZSBNT0RVTEVfU1lNQk9MX1BSRUZJWCBD T05GSUdfU1lNQk9MX1BSRUZJWAorI2lmZGVmIENPTkZJR19IQVZFX1VOREVSU0NPUkVfU1lNQk9M X1BSRUZJWAorI2RlZmluZSBfX1ZNTElOVVhfU1lNQk9MKHgpIF8jI3gKKyNkZWZpbmUgX19WTUxJ TlVYX1NZTUJPTF9TVFIoeCkgIl8iICN4CiAjZWxzZQotI2RlZmluZSBNT0RVTEVfU1lNQk9MX1BS RUZJWCAiIgorI2RlZmluZSBfX1ZNTElOVVhfU1lNQk9MKHgpIHgKKyNkZWZpbmUgX19WTUxJTlVY X1NZTUJPTF9TVFIoeCkgI3gKICNlbmRpZgogCisvKiBJbmRpcmVjdCwgc28gbWFjcm9zIGFyZSBl eHBhbmRlZCBiZWZvcmUgcGFzdGluZy4gKi8KKyNkZWZpbmUgVk1MSU5VWF9TWU1CT0woeCkgX19W TUxJTlVYX1NZTUJPTCh4KQorI2RlZmluZSBWTUxJTlVYX1NZTUJPTF9TVFIoeCkgX19WTUxJTlVY X1NZTUJPTF9TVFIoeCkKKworI2lmbmRlZiBfX0FTU0VNQkxZX18KIHN0cnVjdCBrZXJuZWxfc3lt Ym9sCiB7CiAJdW5zaWduZWQgbG9uZyB2YWx1ZTsKQEAgLTUxLDcgKzU4LDcgQEAgZXh0ZXJuIHN0 cnVjdCBtb2R1bGUgX190aGlzX21vZHVsZTsKIAlfX0NSQ19TWU1CT0woc3ltLCBzZWMpCQkJCQlc CiAJc3RhdGljIGNvbnN0IGNoYXIgX19rc3RydGFiXyMjc3ltW10JCQlcCiAJX19hdHRyaWJ1dGVf Xygoc2VjdGlvbigiX19rc3ltdGFiX3N0cmluZ3MiKSwgYWxpZ25lZCgxKSkpIFwKLQk9IE1PRFVM RV9TWU1CT0xfUFJFRklYICNzeW07CQkJCVwKKwk9IFZNTElOVVhfU1lNQk9MX1NUUihzeW0pOwkJ CQlcCiAJc3RhdGljIGNvbnN0IHN0cnVjdCBrZXJuZWxfc3ltYm9sIF9fa3N5bXRhYl8jI3N5bQlc CiAJX191c2VkCQkJCQkJCVwKIAlfX2F0dHJpYnV0ZV9fKChzZWN0aW9uKCJfX19rc3ltdGFiIiBz ZWMgIisiICNzeW0pLCB1bnVzZWQpKQlcCkBAIC04NSw1ICs5Miw2IEBAIGV4dGVybiBzdHJ1Y3Qg bW9kdWxlIF9fdGhpc19tb2R1bGU7CiAjZGVmaW5lIEVYUE9SVF9VTlVTRURfU1lNQk9MX0dQTChz eW0pCiAKICNlbmRpZiAvKiBDT05GSUdfTU9EVUxFUyAqLworI2VuZGlmIC8qICFfX0FTU0VNQkxZ X18gKi8KIAogI2VuZGlmIC8qIF9MSU5VWF9FWFBPUlRfSCAqLwpkaWZmIC0tZ2l0IGEvaW5jbHVk ZS9saW51eC9rZXJuZWwuaCBiL2luY2x1ZGUvbGludXgva2VybmVsLmgKaW5kZXggODBkMzY4Ny4u ZTEzZTk5MiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9rZXJuZWwuaAorKysgYi9pbmNsdWRl L2xpbnV4L2tlcm5lbC5oCkBAIC03MjMsMTMgKzcyMyw2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBm dHJhY2VfZHVtcChlbnVtIGZ0cmFjZV9kdW1wX21vZGUgb29wc19kdW1wX21vZGUpIHsgfQogLyog VHJhcCBwYXN0ZXJzIG9mIF9fRlVOQ1RJT05fXyBhdCBjb21waWxlLXRpbWUgKi8KICNkZWZpbmUg X19GVU5DVElPTl9fIChfX2Z1bmNfXykKIAotLyogVGhpcyBoZWxwcyB1cyB0byBhdm9pZCAjaWZk ZWYgQ09ORklHX1NZTUJPTF9QUkVGSVggKi8KLSNpZmRlZiBDT05GSUdfU1lNQk9MX1BSRUZJWAot I2RlZmluZSBTWU1CT0xfUFJFRklYIENPTkZJR19TWU1CT0xfUFJFRklYCi0jZWxzZQotI2RlZmlu ZSBTWU1CT0xfUFJFRklYICIiCi0jZW5kaWYKLQogLyogUmVidWlsZCBldmVyeXRoaW5nIG9uIENP TkZJR19GVFJBQ0VfTUNPVU5UX1JFQ09SRCAqLwogI2lmZGVmIENPTkZJR19GVFJBQ0VfTUNPVU5U X1JFQ09SRAogIyBkZWZpbmUgUkVCVUlMRF9EVUVfVE9fRlRSQUNFX01DT1VOVF9SRUNPUkQKZGlm ZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvbW9kdWxlLmggYi9pbmNsdWRlL2xpbnV4L21vZHVsZS5o CmluZGV4IGVhZDFiNTcuLjQ2ZjFlYTAgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvbW9kdWxl LmgKKysrIGIvaW5jbHVkZS9saW51eC9tb2R1bGUuaApAQCAtMTkwLDcgKzE5MCw3IEBAIGV4dGVy biBpbnQgbW9kdWxlc19kaXNhYmxlZDsgLyogZm9yIHN5c2N0bCAqLwogLyogR2V0L3B1dCBhIGtl cm5lbCBzeW1ib2wgKGNhbGxzIG11c3QgYmUgc3ltbWV0cmljKSAqLwogdm9pZCAqX19zeW1ib2xf Z2V0KGNvbnN0IGNoYXIgKnN5bWJvbCk7CiB2b2lkICpfX3N5bWJvbF9nZXRfZ3BsKGNvbnN0IGNo YXIgKnN5bWJvbCk7Ci0jZGVmaW5lIHN5bWJvbF9nZXQoeCkgKCh0eXBlb2YoJngpKShfX3N5bWJv bF9nZXQoTU9EVUxFX1NZTUJPTF9QUkVGSVggI3gpKSkKKyNkZWZpbmUgc3ltYm9sX2dldCh4KSAo KHR5cGVvZigmeCkpKF9fc3ltYm9sX2dldChWTUxJTlVYX1NZTUJPTF9TVFIoeCkpKSkKIAogLyog bW9kdWxlcyB1c2luZyBvdGhlciBtb2R1bGVzOiBrZGIgd2FudHMgdG8gc2VlIHRoaXMuICovCiBz dHJ1Y3QgbW9kdWxlX3VzZSB7CkBAIC00NTMsNyArNDUzLDcgQEAgZXh0ZXJuIHZvaWQgX19tb2R1 bGVfcHV0X2FuZF9leGl0KHN0cnVjdCBtb2R1bGUgKm1vZCwgbG9uZyBjb2RlKQogI2lmZGVmIENP TkZJR19NT0RVTEVfVU5MT0FECiB1bnNpZ25lZCBsb25nIG1vZHVsZV9yZWZjb3VudChzdHJ1Y3Qg bW9kdWxlICptb2QpOwogdm9pZCBfX3N5bWJvbF9wdXQoY29uc3QgY2hhciAqc3ltYm9sKTsKLSNk ZWZpbmUgc3ltYm9sX3B1dCh4KSBfX3N5bWJvbF9wdXQoTU9EVUxFX1NZTUJPTF9QUkVGSVggI3gp CisjZGVmaW5lIHN5bWJvbF9wdXQoeCkgX19zeW1ib2xfcHV0KFZNTElOVVhfU1lNQk9MX1NUUih4 KSkKIHZvaWQgc3ltYm9sX3B1dF9hZGRyKHZvaWQgKmFkZHIpOwogCiAvKiBTb21ldGltZXMgd2Ug a25vdyB3ZSBhbHJlYWR5IGhhdmUgYSByZWZjb3VudCwgYW5kIGl0J3MgZWFzaWVyIG5vdApkaWZm IC0tZ2l0IGEva2VybmVsL21vZHNpZ25fY2VydGlmaWNhdGUuUyBiL2tlcm5lbC9tb2RzaWduX2Nl cnRpZmljYXRlLlMKaW5kZXggMjQ2YjRjNi4uNGE5YTg2ZCAxMDA2NDQKLS0tIGEva2VybmVsL21v ZHNpZ25fY2VydGlmaWNhdGUuUworKysgYi9rZXJuZWwvbW9kc2lnbl9jZXJ0aWZpY2F0ZS5TCkBA IC0xLDE1ICsxLDggQEAKLS8qIFNZTUJPTF9QUkVGSVggZGVmaW5lZCBvbiBjb21tYW5kbGluZSBm cm9tIENPTkZJR19TWU1CT0xfUFJFRklYICovCi0jaWZuZGVmIFNZTUJPTF9QUkVGSVgKLSNkZWZp bmUgQVNNX1NZTUJPTChzeW0pIHN5bQotI2Vsc2UKLSNkZWZpbmUgUEFTVEUyKHgseSkgeCMjeQot I2RlZmluZSBQQVNURSh4LHkpIFBBU1RFMih4LHkpCi0jZGVmaW5lIEFTTV9TWU1CT0woc3ltKSBQ QVNURShTWU1CT0xfUFJFRklYLCBzeW0pCi0jZW5kaWYKKyNpbmNsdWRlIDxsaW51eC9leHBvcnQu aD4KIAogI2RlZmluZSBHTE9CQUwobmFtZSkJXAotCS5nbG9ibCBBU01fU1lNQk9MKG5hbWUpOwlc Ci0JQVNNX1NZTUJPTChuYW1lKToKKwkuZ2xvYmwgVk1MSU5VWF9TWU1CT0wobmFtZSk7CVwKKwlW TUxJTlVYX1NZTUJPTChuYW1lKToKIAogCS5zZWN0aW9uICIuaW5pdC5kYXRhIiwiYXciCiAKZGlm ZiAtLWdpdCBhL2tlcm5lbC9tb2R1bGUuYyBiL2tlcm5lbC9tb2R1bGUuYwppbmRleCAwOTI1Yzlh Li5jZmQ0YTNmIDEwMDY0NAotLS0gYS9rZXJuZWwvbW9kdWxlLmMKKysrIGIva2VybmVsL21vZHVs ZS5jCkBAIC0xMjA5LDcgKzEyMDksNyBAQCBzdGF0aWMgaW5saW5lIGludCBjaGVja19tb2RzdHJ1 Y3RfdmVyc2lvbihFbGZfU2hkciAqc2VjaGRycywKIAogCS8qIFNpbmNlIHRoaXMgc2hvdWxkIGJl IGZvdW5kIGluIGtlcm5lbCAod2hpY2ggY2FuJ3QgYmUgcmVtb3ZlZCksCiAJICogbm8gbG9ja2lu ZyBpcyBuZWNlc3NhcnkuICovCi0JaWYgKCFmaW5kX3N5bWJvbChNT0RVTEVfU1lNQk9MX1BSRUZJ WCAibW9kdWxlX2xheW91dCIsIE5VTEwsCisJaWYgKCFmaW5kX3N5bWJvbChWTUxJTlVYX1NZTUJP TF9TVFIobW9kdWxlX2xheW91dCksIE5VTEwsCiAJCQkgJmNyYywgdHJ1ZSwgZmFsc2UpKQogCQlC VUcoKTsKIAlyZXR1cm4gY2hlY2tfdmVyc2lvbihzZWNoZHJzLCB2ZXJzaW5kZXgsICJtb2R1bGVf bGF5b3V0IiwgbW9kLCBjcmMsCmRpZmYgLS1naXQgYS9zY3JpcHRzL01ha2VmaWxlLmxpYiBiL3Nj cmlwdHMvTWFrZWZpbGUubGliCmluZGV4IDA3MTI1ZTYuLmEzNzNhMWYgMTAwNjQ0Ci0tLSBhL3Nj cmlwdHMvTWFrZWZpbGUubGliCisrKyBiL3NjcmlwdHMvTWFrZWZpbGUubGliCkBAIC0xMTksMTMg KzExOSw2IEBAIF9jX2ZsYWdzICs9ICQoaWYgJChwYXRzdWJzdCBuJSwsIFwKIAkJJChDRkxBR1Nf R0NPVikpCiBlbmRpZgogCi1pZmRlZiBDT05GSUdfU1lNQk9MX1BSRUZJWAotX3N5bV9mbGFncyA9 IC1EU1lNQk9MX1BSRUZJWD0kKHBhdHN1YnN0ICIlIiwlLCQoQ09ORklHX1NZTUJPTF9QUkVGSVgp KQotX2NwcF9mbGFncyArPSAkKF9zeW1fZmxhZ3MpCi1fYV9mbGFncyArPSAkKF9zeW1fZmxhZ3Mp Ci1lbmRpZgotCi0KICMgSWYgYnVpbGRpbmcgdGhlIGtlcm5lbCBpbiBhIHNlcGFyYXRlIG9ianRy ZWUgZXhwYW5kIGFsbCBvY2N1cnJlbmNlcwogIyBvZiAtSWRpciB0byAtSSQoc3JjdHJlZSkvZGly IGV4Y2VwdCBmb3IgYWJzb2x1dGUgcGF0aHMgKHN0YXJ0aW5nIHdpdGggJy8nKS4KIApkaWZmIC0t Z2l0IGEvc2NyaXB0cy9saW5rLXZtbGludXguc2ggYi9zY3JpcHRzL2xpbmstdm1saW51eC5zaApp bmRleCAzZDU2OWQ2Li4wMTQ5OTQ5IDEwMDY0NAotLS0gYS9zY3JpcHRzL2xpbmstdm1saW51eC5z aAorKysgYi9zY3JpcHRzL2xpbmstdm1saW51eC5zaApAQCAtNzQsOSArNzQsOCBAQCBrYWxsc3lt cygpCiAJaW5mbyBLU1lNICR7Mn0KIAlsb2NhbCBrYWxsc3ltb3B0OwogCi0JaWYgWyAtbiAiJHtD T05GSUdfU1lNQk9MX1BSRUZJWH0iIF07IHRoZW4KLQkJa2FsbHN5bW9wdD0iJHtrYWxsc3ltb3B0 fSBcCi0JCQkgICAgLS1zeW1ib2wtcHJlZml4PSR7Q09ORklHX1NZTUJPTF9QUkVGSVh9IgorCWlm IFsgLW4gIiR7Q09ORklHX0hBVkVfVU5ERVJTQ09SRV9TWU1CT0xfUFJFRklYfSIgXTsgdGhlbgor CQlrYWxsc3ltb3B0PSIke2thbGxzeW1vcHR9IC0tc3ltYm9sLXByZWZpeD1fIgogCWZpCiAKIAlp ZiBbIC1uICIke0NPTkZJR19LQUxMU1lNU19BTEx9IiBdOyB0aGVuCmRpZmYgLS1naXQgYS9zY3Jp cHRzL21vZC9tb2Rwb3N0LmMgYi9zY3JpcHRzL21vZC9tb2Rwb3N0LmMKaW5kZXggNzhiMzBjMS4u MjgyZGVjZiAxMDA2NDQKLS0tIGEvc2NyaXB0cy9tb2QvbW9kcG9zdC5jCisrKyBiL3NjcmlwdHMv bW9kL21vZHBvc3QuYwpAQCAtMTgsMTQgKzE4LDcgQEAKICNpbmNsdWRlICJtb2Rwb3N0LmgiCiAj aW5jbHVkZSAiLi4vLi4vaW5jbHVkZS9nZW5lcmF0ZWQvYXV0b2NvbmYuaCIKICNpbmNsdWRlICIu Li8uLi9pbmNsdWRlL2xpbnV4L2xpY2Vuc2UuaCIKLQotLyogU29tZSB0b29sY2hhaW5zIHVzZSBh IGBfJyBwcmVmaXggZm9yIGFsbCB1c2VyIHN5bWJvbHMuICovCi0jaWZkZWYgQ09ORklHX1NZTUJP TF9QUkVGSVgKLSNkZWZpbmUgTU9EVUxFX1NZTUJPTF9QUkVGSVggQ09ORklHX1NZTUJPTF9QUkVG SVgKLSNlbHNlCi0jZGVmaW5lIE1PRFVMRV9TWU1CT0xfUFJFRklYICIiCi0jZW5kaWYKLQorI2lu Y2x1ZGUgIi4uLy4uL2luY2x1ZGUvbGludXgvZXhwb3J0LmgiCiAKIC8qIEFyZSB3ZSB1c2luZyBD T05GSUdfTU9EVkVSU0lPTlM/ICovCiBpbnQgbW9kdmVyc2lvbnMgPSAwOwpAQCAtNTYyLDcgKzU1 NSw3IEBAIHN0YXRpYyB2b2lkIHBhcnNlX2VsZl9maW5pc2goc3RydWN0IGVsZl9pbmZvICppbmZv KQogc3RhdGljIGludCBpZ25vcmVfdW5kZWZfc3ltYm9sKHN0cnVjdCBlbGZfaW5mbyAqaW5mbywg Y29uc3QgY2hhciAqc3ltbmFtZSkKIHsKIAkvKiBpZ25vcmUgX190aGlzX21vZHVsZSwgaXQgd2ls bCBiZSByZXNvbHZlZCBzaG9ydGx5ICovCi0JaWYgKHN0cmNtcChzeW1uYW1lLCBNT0RVTEVfU1lN Qk9MX1BSRUZJWCAiX190aGlzX21vZHVsZSIpID09IDApCisJaWYgKHN0cmNtcChzeW1uYW1lLCBW TUxJTlVYX1NZTUJPTF9TVFIoX190aGlzX21vZHVsZSkpID09IDApCiAJCXJldHVybiAxOwogCS8q IGlnbm9yZSBnbG9iYWwgb2Zmc2V0IHRhYmxlICovCiAJaWYgKHN0cmNtcChzeW1uYW1lLCAiX0dM T0JBTF9PRkZTRVRfVEFCTEVfIikgPT0gMCkKQEAgLTU4Myw4ICs1NzYsOCBAQCBzdGF0aWMgaW50 IGlnbm9yZV91bmRlZl9zeW1ib2woc3RydWN0IGVsZl9pbmZvICppbmZvLCBjb25zdCBjaGFyICpz eW1uYW1lKQogCXJldHVybiAwOwogfQogCi0jZGVmaW5lIENSQ19QRlggICAgIE1PRFVMRV9TWU1C T0xfUFJFRklYICJfX2NyY18iCi0jZGVmaW5lIEtTWU1UQUJfUEZYIE1PRFVMRV9TWU1CT0xfUFJF RklYICJfX2tzeW10YWJfIgorI2RlZmluZSBDUkNfUEZYICAgICBWTUxJTlVYX1NZTUJPTF9TVFIo X19jcmNfKQorI2RlZmluZSBLU1lNVEFCX1BGWCBWTUxJTlVYX1NZTUJPTF9TVFIoX19rc3ltdGFi XykKIAogc3RhdGljIHZvaWQgaGFuZGxlX21vZHZlcnNpb25zKHN0cnVjdCBtb2R1bGUgKm1vZCwg c3RydWN0IGVsZl9pbmZvICppbmZvLAogCQkJICAgICAgIEVsZl9TeW0gKnN5bSwgY29uc3QgY2hh ciAqc3ltbmFtZSkKQEAgLTYzNywxNCArNjMwLDE1IEBAIHN0YXRpYyB2b2lkIGhhbmRsZV9tb2R2 ZXJzaW9ucyhzdHJ1Y3QgbW9kdWxlICptb2QsIHN0cnVjdCBlbGZfaW5mbyAqaW5mbywKIAkJfQog I2VuZGlmCiAKLQkJaWYgKG1lbWNtcChzeW1uYW1lLCBNT0RVTEVfU1lNQk9MX1BSRUZJWCwKLQkJ CSAgIHN0cmxlbihNT0RVTEVfU1lNQk9MX1BSRUZJWCkpID09IDApIHsKLQkJCW1vZC0+dW5yZXMg PQotCQkJICBhbGxvY19zeW1ib2woc3ltbmFtZSArCi0JCQkgICAgICAgICAgICAgICBzdHJsZW4o TU9EVUxFX1NZTUJPTF9QUkVGSVgpLAotCQkJICAgICAgICAgICAgICAgRUxGX1NUX0JJTkQoc3lt LT5zdF9pbmZvKSA9PSBTVEJfV0VBSywKLQkJCSAgICAgICAgICAgICAgIG1vZC0+dW5yZXMpOwot CQl9CisjaWZkZWYgQ09ORklHX0hBVkVfVU5ERVJTQ09SRV9TWU1CT0xfUFJFRklYCisJCWlmIChz eW1uYW1lWzBdICE9ICdfJykKKwkJCWJyZWFrOworCQllbHNlCisJCQlzeW1uYW1lKys7CisjZW5k aWYKKwkJbW9kLT51bnJlcyA9IGFsbG9jX3N5bWJvbChzeW1uYW1lLAorCQkJCQkgIEVMRl9TVF9C SU5EKHN5bS0+c3RfaW5mbykgPT0gU1RCX1dFQUssCisJCQkJCSAgbW9kLT51bnJlcyk7CiAJCWJy ZWFrOwogCWRlZmF1bHQ6CiAJCS8qIEFsbCBleHBvcnRlZCBzeW1ib2xzICovCkBAIC02NTIsOSAr NjQ2LDkgQEAgc3RhdGljIHZvaWQgaGFuZGxlX21vZHZlcnNpb25zKHN0cnVjdCBtb2R1bGUgKm1v ZCwgc3RydWN0IGVsZl9pbmZvICppbmZvLAogCQkJc3ltX2FkZF9leHBvcnRlZChzeW1uYW1lICsg c3RybGVuKEtTWU1UQUJfUEZYKSwgbW9kLAogCQkJCQlleHBvcnQpOwogCQl9Ci0JCWlmIChzdHJj bXAoc3ltbmFtZSwgTU9EVUxFX1NZTUJPTF9QUkVGSVggImluaXRfbW9kdWxlIikgPT0gMCkKKwkJ aWYgKHN0cmNtcChzeW1uYW1lLCBWTUxJTlVYX1NZTUJPTF9TVFIoaW5pdF9tb2R1bGUpKSA9PSAw KQogCQkJbW9kLT5oYXNfaW5pdCA9IDE7Ci0JCWlmIChzdHJjbXAoc3ltbmFtZSwgTU9EVUxFX1NZ TUJPTF9QUkVGSVggImNsZWFudXBfbW9kdWxlIikgPT0gMCkKKwkJaWYgKHN0cmNtcChzeW1uYW1l LCBWTUxJTlVYX1NZTUJPTF9TVFIoY2xlYW51cF9tb2R1bGUpKSA9PSAwKQogCQkJbW9kLT5oYXNf Y2xlYW51cCA9IDE7CiAJCWJyZWFrOwogCX0KLS0KY2dpdCB2MC45LjEK --f46d0444e97f814f0a04d7f4011a Content-Type: application/octet-stream; name="CONFIG_SYMBOL_PREFIX-cleanup-from-next-20130315.patch" Content-Disposition: attachment; filename="CONFIG_SYMBOL_PREFIX-cleanup-from-next-20130315.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_heb733ts1 RnJvbSA4Mzc3MThiZmQyOGJhNWY0NzRjMTE4MmVmMjYzOWI2OTQ5ZDg1NGZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSdXN0eSBSdXNzZWxsIDxydXN0eUBydXN0Y29ycC5jb20uYXU+ CkRhdGU6IFdlZCwgMTMgTWFyIDIwMTMgMDI6MDM6NDUgKzAwMDAKU3ViamVjdDogQ09ORklHX1NZ TUJPTF9QUkVGSVg6IGNsZWFudXAuCgpXZSBoYXZlIENPTkZJR19TWU1CT0xfUFJFRklYLCB3aGlj aCB0aHJlZSBhcmNocyBkZWZpbmUgdG8gdGhlIHN0cmluZwoiXyIuICBCdXQgQWwgVmlybyBicm9r ZSB0aGlzIGluICJjb25zb2xpZGF0ZSBjb25kX3N5c2NhbGwgYW5kClNZU0NBTExfQUxJQVMgZGVj bGFyYXRpb25zIiAoaW4gbGludXgtbmV4dCksIGFuZCBoZSdzIG5vdCB0aGUgZmlyc3QgdG8KZG8g c28uCgpVc2luZyBDT05GSUdfU1lNQk9MX1BSRUZJWCBpcyBhd2t3YXJkLCBzaW5jZSB3ZSB1c3Vh bGx5IGp1c3Qgd2FudCB0bwpwcmVmaXggaXQgc28gc29tZXRoaW5nLiAgU28gdmFyaW91cyBwbGFj ZXMgZGVmaW5lIGhlbHBlcnMgd2hpY2ggYXJlCmRlZmluZWQgdG8gbm90aGluZyBpZiBDT05GSUdf U1lNQk9MX1BSRUZJWCBpc24ndCBzZXQ6CgoxKSBpbmNsdWRlL2FzbS1nZW5lcmljL3VuaXN0ZC5o IGRlZmluZXMgX19TWU1CT0xfUFJFRklYLgoyKSBpbmNsdWRlL2FzbS1nZW5lcmljL3ZtbGludXgu bGRzLmggZGVmaW5lcyBWTUxJTlVYX1NZTUJPTChzeW0pCjMpIGluY2x1ZGUvbGludXgvZXhwb3J0 LmggZGVmaW5lcyBNT0RVTEVfU1lNQk9MX1BSRUZJWC4KNCkgaW5jbHVkZS9saW51eC9rZXJuZWwu aCBkZWZpbmVzIFNZTUJPTF9QUkVGSVggKHdoaWNoIGRpZmZlcnMgZnJvbSAjNykKNSkga2VybmVs L21vZHNpZ25fY2VydGlmaWNhdGUuUyBkZWZpbmVzIEFTTV9TWU1CT0woc3ltKQo2KSBzY3JpcHRz L21vZHBvc3QuYyBkZWZpbmVzIE1PRFVMRV9TWU1CT0xfUFJFRklYCjcpIHNjcmlwdHMvTWFrZWZp bGUubGliIGRlZmluZXMgU1lNQk9MX1BSRUZJWCBvbiB0aGUgY29tbWFuZGxpbmUgaWYKICAgQ09O RklHX1NZTUJPTF9QUkVGSVggaXMgc2V0LCBzbyB0aGF0IHdlIGhhdmUgYSBub24tc3RyaW5nIHZl cnNpb24KICAgZm9yIHBhc3RpbmcuCgooYXJjaC9oODMwMC9pbmNsdWRlL2FzbS9saW5rYWdlLmgg ZGVmaW5lcyBTWU1CT0xfTkFNRSgpLCB0b28pLgoKTGV0J3Mgc29sdmUgdGhpcyBwcm9wZXJseToK MSkgTm8gbW9yZSBnZW5lcmljIHByZWZpeCwganVzdCBDT05GSUdfSEFWRV9VTkRFUlNDT1JFX1NZ TUJPTF9QUkVGSVguCjIpIE1ha2UgbGludXgvZXhwb3J0LmggdXNhYmxlIGZyb20gYXNtLgozKSBE ZWZpbmUgVk1MSU5VWF9TWU1CT0wsIFZNTElOVVhfU1lNQk9MX1NUUiBhbmQgVk1MSU5VWF9TWU1C T0xfUFJFRklYX1NUUi4KNCkgTWFrZSBldmVyeW9uZSB1c2UgdGhlbS4KClNpZ25lZC1vZmYtYnk6 IFJ1c3R5IFJ1c3NlbGwgPHJ1c3R5QHJ1c3Rjb3JwLmNvbS5hdT4KUmV2aWV3ZWQtYnk6IEphbWVz IEhvZ2FuIDxqYW1lcy5ob2dhbkBpbWd0ZWMuY29tPgpUZXN0ZWQtYnk6IEphbWVzIEhvZ2FuIDxq YW1lcy5ob2dhbkBpbWd0ZWMuY29tPiAob24gbWV0YWcpCi0tLQpkaWZmIC0tZ2l0IGEvTWFrZWZp bGUgYi9NYWtlZmlsZQppbmRleCBhMDVlYTQyLi4xMGZiNmM3IDEwMDY0NAotLS0gYS9NYWtlZmls ZQorKysgYi9NYWtlZmlsZQpAQCAtMTM5OCw3ICsxMzk4LDcgQEAgcXVpZXRfY21kX3JtZmlsZXMg PSAkKGlmICQod2lsZGNhcmQgJChybS1maWxlcykpLENMRUFOICAgJCh3aWxkY2FyZCAkKHJtLWZp bGVzKSkKICMgUnVuIGRlcG1vZCBvbmx5IGlmIHdlIGhhdmUgU3lzdGVtLm1hcCBhbmQgZGVwbW9k IGlzIGV4ZWN1dGFibGUKIHF1aWV0X2NtZF9kZXBtb2QgPSBERVBNT0QgICQoS0VSTkVMUkVMRUFT RSkKICAgICAgIGNtZF9kZXBtb2QgPSAkKENPTkZJR19TSEVMTCkgJChzcmN0cmVlKS9zY3JpcHRz L2RlcG1vZC5zaCAkKERFUE1PRCkgXAotICAgICAgICAgICAgICAgICAgICQoS0VSTkVMUkVMRUFT RSkgIiQocGF0c3Vic3QgIiUiLCUsJChDT05GSUdfU1lNQk9MX1BSRUZJWCkpIgorICAgICAgICAg ICAgICAgICAgICQoS0VSTkVMUkVMRUFTRSkgIiQocGF0c3Vic3QgeSxfLCQoQ09ORklHX0hBVkVf U1lNQk9MX1BSRUZJWF9VTkRFUlNDT1JFKSkiCiAKICMgQ3JlYXRlIHRlbXBvcmFyeSBkaXIgZm9y IG1vZHVsZSBzdXBwb3J0IGZpbGVzCiAjIGNsZWFuIGl0IHVwIG9ubHkgd2hlbiBidWlsZGluZyBh bGwgbW9kdWxlcwpkaWZmIC0tZ2l0IGEvYXJjaC9LY29uZmlnIGIvYXJjaC9LY29uZmlnCmluZGV4 IDE0NTU1NzkuLjdiNDMzYTQgMTAwNjQ0Ci0tLSBhL2FyY2gvS2NvbmZpZworKysgYi9hcmNoL0tj b25maWcKQEAgLTM4NCw2ICszODQsMTIgQEAgY29uZmlnIE1PRFVMRVNfVVNFX0VMRl9SRUwKIAkg IE1vZHVsZXMgb25seSB1c2UgRUxGIFJFTCByZWxvY2F0aW9ucy4gIE1vZHVsZXMgd2l0aCBFTEYg UkVMQQogCSAgcmVsb2NhdGlvbnMgd2lsbCBnaXZlIGFuIGVycm9yLgogCitjb25maWcgSEFWRV9V TkRFUlNDT1JFX1NZTUJPTF9QUkVGSVgKKwlib29sCisJaGVscAorCSAgU29tZSBhcmNoaXRlY3R1 cmVzIGdlbmVyYXRlIGFuIF8gaW4gZnJvbnQgb2YgQyBzeW1ib2xzOyB0aGluZ3MgbGlrZQorCSAg bW9kdWxlIGxvYWRpbmcgYW5kIGFzc2VtYmx5IGZpbGVzIG5lZWQgdG8ga25vdyBhYm91dCB0aGlz LgorCiAjCiAjIEFCSSBoYWxsIG9mIHNoYW1lCiAjCmRpZmYgLS1naXQgYS9hcmNoL2JsYWNrZmlu L0tjb25maWcgYi9hcmNoL2JsYWNrZmluL0tjb25maWcKaW5kZXggYzNmMmUwYi4uNDUzZWJlNCAx MDA2NDQKLS0tIGEvYXJjaC9ibGFja2Zpbi9LY29uZmlnCisrKyBiL2FyY2gvYmxhY2tmaW4vS2Nv bmZpZwpAQCAtMSw3ICsxLDMgQEAKLWNvbmZpZyBTWU1CT0xfUFJFRklYCi0Jc3RyaW5nCi0JZGVm YXVsdCAiXyIKLQogY29uZmlnIE1NVQogCWRlZl9ib29sIG4KIApAQCAtMzMsNiArMjksNyBAQCBj b25maWcgQkxBQ0tGSU4KIAlzZWxlY3QgQVJDSF9IQVZFX0NVU1RPTV9HUElPX0gKIAlzZWxlY3Qg QVJDSF9XQU5UX09QVElPTkFMX0dQSU9MSUIKIAlzZWxlY3QgSEFWRV9VSUQxNgorCXNlbGVjdCBI QVZFX1VOREVSU0NPUkVfU1lNQk9MX1BSRUZJWAogCXNlbGVjdCBWSVJUX1RPX0JVUwogCXNlbGVj dCBBUkNIX1dBTlRfSVBDX1BBUlNFX1ZFUlNJT04KIAlzZWxlY3QgSEFWRV9HRU5FUklDX0hBUkRJ UlFTCmRpZmYgLS1naXQgYS9hcmNoL2g4MzAwL0tjb25maWcgYi9hcmNoL2g4MzAwL0tjb25maWcK aW5kZXggNzkyNTBkZS4uMzAzZTRmOSAxMDA2NDQKLS0tIGEvYXJjaC9oODMwMC9LY29uZmlnCisr KyBiL2FyY2gvaDgzMDAvS2NvbmZpZwpAQCAtMTIsMTAgKzEyLDcgQEAgY29uZmlnIEg4MzAwCiAJ c2VsZWN0IE1PRFVMRVNfVVNFX0VMRl9SRUxBCiAJc2VsZWN0IE9MRF9TSUdTVVNQRU5EMwogCXNl bGVjdCBPTERfU0lHQUNUSU9OCi0KLWNvbmZpZyBTWU1CT0xfUFJFRklYCi0Jc3RyaW5nCi0JZGVm YXVsdCAiXyIKKwlzZWxlY3QgSEFWRV9VTkRFUlNDT1JFX1NZTUJPTF9QUkVGSVgKIAogY29uZmln IE1NVQogCWJvb2wKZGlmZiAtLWdpdCBhL2FyY2gvbWV0YWcvS2NvbmZpZyBiL2FyY2gvbWV0YWcv S2NvbmZpZwppbmRleCBhZmM4OTczLi4yMDk5NjE3IDEwMDY0NAotLS0gYS9hcmNoL21ldGFnL0tj b25maWcKKysrIGIvYXJjaC9tZXRhZy9LY29uZmlnCkBAIC0xLDcgKzEsMyBAQAotY29uZmlnIFNZ TUJPTF9QUkVGSVgKLQlzdHJpbmcKLQlkZWZhdWx0ICJfIgotCiBjb25maWcgTUVUQUcKIAlkZWZf Ym9vbCB5CiAJc2VsZWN0IEVNQkVEREVECkBAIC0yNyw2ICsyMyw3IEBAIGNvbmZpZyBNRVRBRwog CXNlbGVjdCBIQVZFX01PRF9BUkNIX1NQRUNJRklDCiAJc2VsZWN0IEhBVkVfUEVSRl9FVkVOVFMK IAlzZWxlY3QgSEFWRV9TWVNDQUxMX1RSQUNFUE9JTlRTCisJc2VsZWN0IEhBVkVfVU5ERVJTQ09S RV9TWU1CT0xfUFJFRklYCiAJc2VsZWN0IElSUV9ET01BSU4KIAlzZWxlY3QgTU9EVUxFU19VU0Vf RUxGX1JFTEEKIAlzZWxlY3QgT0YKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL2NoaXBzL2dlbl9w cm9iZS5jIGIvZHJpdmVycy9tdGQvY2hpcHMvZ2VuX3Byb2JlLmMKaW5kZXggM2I5YTI4NC4uMDBk MjBhZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9tdGQvY2hpcHMvZ2VuX3Byb2JlLmMKKysrIGIvZHJp dmVycy9tdGQvY2hpcHMvZ2VuX3Byb2JlLmMKQEAgLTIwNCwxNCArMjA0LDE0IEBAIHN0YXRpYyBp bmxpbmUgc3RydWN0IG10ZF9pbmZvICpjZmlfY21kc2V0X3Vua25vd24oc3RydWN0IG1hcF9pbmZv ICptYXAsCiAJc3RydWN0IGNmaV9wcml2YXRlICpjZmkgPSBtYXAtPmZsZHJ2X3ByaXY7CiAJX191 MTYgdHlwZSA9IHByaW1hcnk/Y2ZpLT5jZmlxLT5QX0lEOmNmaS0+Y2ZpcS0+QV9JRDsKICNpZmRl ZiBDT05GSUdfTU9EVUxFUwotCWNoYXIgcHJvYmVuYW1lWzE2K3NpemVvZihNT0RVTEVfU1lNQk9M X1BSRUZJWCldOworCWNoYXIgcHJvYmVuYW1lWzE2K3NpemVvZihWTUxJTlVYX1NZTUJPTF9QUkVG SVhfU1RSKV07CiAJY2ZpX2NtZHNldF9mbl90ICpwcm9iZV9mdW5jdGlvbjsKIAotCXNwcmludGYo cHJvYmVuYW1lLCBNT0RVTEVfU1lNQk9MX1BSRUZJWCAiY2ZpX2NtZHNldF8lNC40WCIsIHR5cGUp OworCXNwcmludGYocHJvYmVuYW1lLCBWTUxJTlVYX1NZTUJPTF9QUkVGSVhfU1RSICJjZmlfY21k c2V0XyU0LjRYIiwgdHlwZSk7CiAKIAlwcm9iZV9mdW5jdGlvbiA9IF9fc3ltYm9sX2dldChwcm9i ZW5hbWUpOwogCWlmICghcHJvYmVfZnVuY3Rpb24pIHsKLQkJcmVxdWVzdF9tb2R1bGUocHJvYmVu YW1lICsgc2l6ZW9mKE1PRFVMRV9TWU1CT0xfUFJFRklYKSAtIDEpOworCQlyZXF1ZXN0X21vZHVs ZShwcm9iZW5hbWUgKyBzaXplb2YoVk1MSU5VWF9TWU1CT0xfUFJFRklYX1NUUiktMSk7CiAJCXBy b2JlX2Z1bmN0aW9uID0gX19zeW1ib2xfZ2V0KHByb2JlbmFtZSk7CiAJfQogCmRpZmYgLS1naXQg YS9pbmNsdWRlL2FzbS1nZW5lcmljL3VuaXN0ZC5oIGIvaW5jbHVkZS9hc20tZ2VuZXJpYy91bmlz dGQuaAppbmRleCA0MDc3YjVkLi4xNWMwNTk4IDEwMDY0NAotLS0gYS9pbmNsdWRlL2FzbS1nZW5l cmljL3VuaXN0ZC5oCisrKyBiL2luY2x1ZGUvYXNtLWdlbmVyaWMvdW5pc3RkLmgKQEAgLTEsNCAr MSw1IEBACiAjaW5jbHVkZSA8dWFwaS9hc20tZ2VuZXJpYy91bmlzdGQuaD4KKyNpbmNsdWRlIDxs aW51eC9leHBvcnQuaD4KIAogLyoKICAqIFRoZXNlIGFyZSByZXF1aXJlZCBzeXN0ZW0gY2FsbHMs IHdlIHNob3VsZApAQCAtMTcsMTIgKzE4LDcgQEAKICAqIGJ1dCBpdCBkb2Vzbid0IHdvcmsgb24g YWxsIHRvb2xjaGFpbnMsIHNvIHdlIGp1c3QgZG8gaXQgYnkgaGFuZAogICovCiAjaWZuZGVmIGNv bmRfc3lzY2FsbAotI2lmZGVmIENPTkZJR19TWU1CT0xfUFJFRklYCi0jZGVmaW5lIF9fU1lNQk9M X1BSRUZJWCBDT05GSUdfU1lNQk9MX1BSRUZJWAotI2Vsc2UKLSNkZWZpbmUgX19TWU1CT0xfUFJF RklYCi0jZW5kaWYKLSNkZWZpbmUgY29uZF9zeXNjYWxsKHgpIGFzbSgiLndlYWtcdCIgX19TWU1C T0xfUFJFRklYICN4ICJcblx0IiBcCi0JCQkgICAgIi5zZXRcdCIgX19TWU1CT0xfUFJFRklYICN4 ICIsIiBcCi0JCQkgICAgX19TWU1CT0xfUFJFRklYICJzeXNfbmlfc3lzY2FsbCIpCisjZGVmaW5l IGNvbmRfc3lzY2FsbCh4KSBhc20oIi53ZWFrXHQiIFZNTElOVVhfU1lNQk9MX1NUUih4KSAiXG5c dCIJXAorCQkJICAgICIuc2V0XHQiIFZNTElOVVhfU1lNQk9MX1NUUih4KSAiLCIJXAorCQkJICAg IFZNTElOVVhfU1lNQk9MX1NUUihzeXNfbmlfc3lzY2FsbCkpCiAjZW5kaWYKZGlmZiAtLWdpdCBh L2luY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5sZHMuaCBiL2luY2x1ZGUvYXNtLWdlbmVyaWMv dm1saW51eC5sZHMuaAppbmRleCBhZmExMmM3Li5lYjU4ZDJkIDEwMDY0NAotLS0gYS9pbmNsdWRl L2FzbS1nZW5lcmljL3ZtbGludXgubGRzLmgKKysrIGIvaW5jbHVkZS9hc20tZ2VuZXJpYy92bWxp bnV4Lmxkcy5oCkBAIC01MiwxMyArNTIsNyBAQAogI2RlZmluZSBMT0FEX09GRlNFVCAwCiAjZW5k aWYKIAotI2lmbmRlZiBTWU1CT0xfUFJFRklYCi0jZGVmaW5lIFZNTElOVVhfU1lNQk9MKHN5bSkg c3ltCi0jZWxzZQotI2RlZmluZSBQQVNURTIoeCx5KSB4IyN5Ci0jZGVmaW5lIFBBU1RFKHgseSkg UEFTVEUyKHgseSkKLSNkZWZpbmUgVk1MSU5VWF9TWU1CT0woc3ltKSBQQVNURShTWU1CT0xfUFJF RklYLCBzeW0pCi0jZW5kaWYKKyNpbmNsdWRlIDxsaW51eC9leHBvcnQuaD4KIAogLyogQWxpZ24g LiB0byBhIDggYnl0ZSBib3VuZGFyeSBlcXVhbHMgdG8gbWF4aW11bSBmdW5jdGlvbiBhbGlnbm1l bnQuICovCiAjZGVmaW5lIEFMSUdOX0ZVTkNUSU9OKCkgIC4gPSBBTElHTig4KQpkaWZmIC0tZ2l0 IGEvaW5jbHVkZS9saW51eC9leHBvcnQuaCBiL2luY2x1ZGUvbGludXgvZXhwb3J0LmgKaW5kZXgg Njk2YzBmNC4uZmM4M2IyYSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9leHBvcnQuaAorKysg Yi9pbmNsdWRlL2xpbnV4L2V4cG9ydC5oCkBAIC03LDE1ICs3LDI3IEBACiAgKgogICogSWYgeW91 IGZlZWwgdGhlIG5lZWQgdG8gYWRkICNpbmNsdWRlIDxsaW51eC9mb28uaD4gdG8gdGhpcyBmaWxl CiAgKiB0aGVuIHlvdSBhcmUgZG9pbmcgc29tZXRoaW5nIHdyb25nIGFuZCBzaG91bGQgZ28gYXdh eSBzaWxlbnRseS4KKyAqCisgKiBJZiB5b3UgdGhpbmsgdGhlIGFib3ZlIGFycm9nYW5jZSBqdXN0 IGVuY291cmFnZXMgbW9yZSBwZW9wbGUgdG8gYWRkCisgKiByYW5kb20gY3JhcCB0byB0aGlzIGZp bGUsIHlvdSdyZSBub3QgYWxvbmUuCiAgKi8KIAogLyogU29tZSB0b29sY2hhaW5zIHVzZSBhIGBf JyBwcmVmaXggZm9yIGFsbCB1c2VyIHN5bWJvbHMuICovCi0jaWZkZWYgQ09ORklHX1NZTUJPTF9Q UkVGSVgKLSNkZWZpbmUgTU9EVUxFX1NZTUJPTF9QUkVGSVggQ09ORklHX1NZTUJPTF9QUkVGSVgK KyNpZmRlZiBDT05GSUdfSEFWRV9VTkRFUlNDT1JFX1NZTUJPTF9QUkVGSVgKKyNkZWZpbmUgX19W TUxJTlVYX1NZTUJPTCh4KSBfIyN4CisjZGVmaW5lIF9fVk1MSU5VWF9TWU1CT0xfU1RSKHgpICJf IiAjeAorI2RlZmluZSBWTUxJTlVYX1NZTUJPTF9QUkVGSVhfU1RSICJfIgogI2Vsc2UKLSNkZWZp bmUgTU9EVUxFX1NZTUJPTF9QUkVGSVggIiIKKyNkZWZpbmUgX19WTUxJTlVYX1NZTUJPTCh4KSB4 CisjZGVmaW5lIF9fVk1MSU5VWF9TWU1CT0xfU1RSKHgpICN4CisjZGVmaW5lIFZNTElOVVhfU1lN Qk9MX1BSRUZJWF9TVFIgIiIKICNlbmRpZgogCisvKiBJbmRpcmVjdCwgc28gbWFjcm9zIGFyZSBl eHBhbmRlZCBiZWZvcmUgcGFzdGluZy4gKi8KKyNkZWZpbmUgVk1MSU5VWF9TWU1CT0woeCkgX19W TUxJTlVYX1NZTUJPTCh4KQorI2RlZmluZSBWTUxJTlVYX1NZTUJPTF9TVFIoeCkgX19WTUxJTlVY X1NZTUJPTF9TVFIoeCkKKworI2lmbmRlZiBfX0FTU0VNQkxZX18KIHN0cnVjdCBrZXJuZWxfc3lt Ym9sCiB7CiAJdW5zaWduZWQgbG9uZyB2YWx1ZTsKQEAgLTUxLDcgKzYzLDcgQEAgZXh0ZXJuIHN0 cnVjdCBtb2R1bGUgX190aGlzX21vZHVsZTsKIAlfX0NSQ19TWU1CT0woc3ltLCBzZWMpCQkJCQlc CiAJc3RhdGljIGNvbnN0IGNoYXIgX19rc3RydGFiXyMjc3ltW10JCQlcCiAJX19hdHRyaWJ1dGVf Xygoc2VjdGlvbigiX19rc3ltdGFiX3N0cmluZ3MiKSwgYWxpZ25lZCgxKSkpIFwKLQk9IE1PRFVM RV9TWU1CT0xfUFJFRklYICNzeW07CQkJCVwKKwk9IFZNTElOVVhfU1lNQk9MX1NUUihzeW0pOwkJ CQlcCiAJc3RhdGljIGNvbnN0IHN0cnVjdCBrZXJuZWxfc3ltYm9sIF9fa3N5bXRhYl8jI3N5bQlc CiAJX191c2VkCQkJCQkJCVwKIAlfX2F0dHJpYnV0ZV9fKChzZWN0aW9uKCJfX19rc3ltdGFiIiBz ZWMgIisiICNzeW0pLCB1bnVzZWQpKQlcCkBAIC04NSw1ICs5Nyw2IEBAIGV4dGVybiBzdHJ1Y3Qg bW9kdWxlIF9fdGhpc19tb2R1bGU7CiAjZGVmaW5lIEVYUE9SVF9VTlVTRURfU1lNQk9MX0dQTChz eW0pCiAKICNlbmRpZiAvKiBDT05GSUdfTU9EVUxFUyAqLworI2VuZGlmIC8qICFfX0FTU0VNQkxZ X18gKi8KIAogI2VuZGlmIC8qIF9MSU5VWF9FWFBPUlRfSCAqLwpkaWZmIC0tZ2l0IGEvaW5jbHVk ZS9saW51eC9rZXJuZWwuaCBiL2luY2x1ZGUvbGludXgva2VybmVsLmgKaW5kZXggODBkMzY4Ny4u ZTEzZTk5MiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9rZXJuZWwuaAorKysgYi9pbmNsdWRl L2xpbnV4L2tlcm5lbC5oCkBAIC03MjMsMTMgKzcyMyw2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBm dHJhY2VfZHVtcChlbnVtIGZ0cmFjZV9kdW1wX21vZGUgb29wc19kdW1wX21vZGUpIHsgfQogLyog VHJhcCBwYXN0ZXJzIG9mIF9fRlVOQ1RJT05fXyBhdCBjb21waWxlLXRpbWUgKi8KICNkZWZpbmUg X19GVU5DVElPTl9fIChfX2Z1bmNfXykKIAotLyogVGhpcyBoZWxwcyB1cyB0byBhdm9pZCAjaWZk ZWYgQ09ORklHX1NZTUJPTF9QUkVGSVggKi8KLSNpZmRlZiBDT05GSUdfU1lNQk9MX1BSRUZJWAot I2RlZmluZSBTWU1CT0xfUFJFRklYIENPTkZJR19TWU1CT0xfUFJFRklYCi0jZWxzZQotI2RlZmlu ZSBTWU1CT0xfUFJFRklYICIiCi0jZW5kaWYKLQogLyogUmVidWlsZCBldmVyeXRoaW5nIG9uIENP TkZJR19GVFJBQ0VfTUNPVU5UX1JFQ09SRCAqLwogI2lmZGVmIENPTkZJR19GVFJBQ0VfTUNPVU5U X1JFQ09SRAogIyBkZWZpbmUgUkVCVUlMRF9EVUVfVE9fRlRSQUNFX01DT1VOVF9SRUNPUkQKZGlm ZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvbW9kdWxlLmggYi9pbmNsdWRlL2xpbnV4L21vZHVsZS5o CmluZGV4IGVhZDFiNTcuLjQ2ZjFlYTAgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvbW9kdWxl LmgKKysrIGIvaW5jbHVkZS9saW51eC9tb2R1bGUuaApAQCAtMTkwLDcgKzE5MCw3IEBAIGV4dGVy biBpbnQgbW9kdWxlc19kaXNhYmxlZDsgLyogZm9yIHN5c2N0bCAqLwogLyogR2V0L3B1dCBhIGtl cm5lbCBzeW1ib2wgKGNhbGxzIG11c3QgYmUgc3ltbWV0cmljKSAqLwogdm9pZCAqX19zeW1ib2xf Z2V0KGNvbnN0IGNoYXIgKnN5bWJvbCk7CiB2b2lkICpfX3N5bWJvbF9nZXRfZ3BsKGNvbnN0IGNo YXIgKnN5bWJvbCk7Ci0jZGVmaW5lIHN5bWJvbF9nZXQoeCkgKCh0eXBlb2YoJngpKShfX3N5bWJv bF9nZXQoTU9EVUxFX1NZTUJPTF9QUkVGSVggI3gpKSkKKyNkZWZpbmUgc3ltYm9sX2dldCh4KSAo KHR5cGVvZigmeCkpKF9fc3ltYm9sX2dldChWTUxJTlVYX1NZTUJPTF9TVFIoeCkpKSkKIAogLyog bW9kdWxlcyB1c2luZyBvdGhlciBtb2R1bGVzOiBrZGIgd2FudHMgdG8gc2VlIHRoaXMuICovCiBz dHJ1Y3QgbW9kdWxlX3VzZSB7CkBAIC00NTMsNyArNDUzLDcgQEAgZXh0ZXJuIHZvaWQgX19tb2R1 bGVfcHV0X2FuZF9leGl0KHN0cnVjdCBtb2R1bGUgKm1vZCwgbG9uZyBjb2RlKQogI2lmZGVmIENP TkZJR19NT0RVTEVfVU5MT0FECiB1bnNpZ25lZCBsb25nIG1vZHVsZV9yZWZjb3VudChzdHJ1Y3Qg bW9kdWxlICptb2QpOwogdm9pZCBfX3N5bWJvbF9wdXQoY29uc3QgY2hhciAqc3ltYm9sKTsKLSNk ZWZpbmUgc3ltYm9sX3B1dCh4KSBfX3N5bWJvbF9wdXQoTU9EVUxFX1NZTUJPTF9QUkVGSVggI3gp CisjZGVmaW5lIHN5bWJvbF9wdXQoeCkgX19zeW1ib2xfcHV0KFZNTElOVVhfU1lNQk9MX1NUUih4 KSkKIHZvaWQgc3ltYm9sX3B1dF9hZGRyKHZvaWQgKmFkZHIpOwogCiAvKiBTb21ldGltZXMgd2Ug a25vdyB3ZSBhbHJlYWR5IGhhdmUgYSByZWZjb3VudCwgYW5kIGl0J3MgZWFzaWVyIG5vdApkaWZm IC0tZ2l0IGEva2VybmVsL21vZHNpZ25fY2VydGlmaWNhdGUuUyBiL2tlcm5lbC9tb2RzaWduX2Nl cnRpZmljYXRlLlMKaW5kZXggMjQ2YjRjNi4uNGE5YTg2ZCAxMDA2NDQKLS0tIGEva2VybmVsL21v ZHNpZ25fY2VydGlmaWNhdGUuUworKysgYi9rZXJuZWwvbW9kc2lnbl9jZXJ0aWZpY2F0ZS5TCkBA IC0xLDE1ICsxLDggQEAKLS8qIFNZTUJPTF9QUkVGSVggZGVmaW5lZCBvbiBjb21tYW5kbGluZSBm cm9tIENPTkZJR19TWU1CT0xfUFJFRklYICovCi0jaWZuZGVmIFNZTUJPTF9QUkVGSVgKLSNkZWZp bmUgQVNNX1NZTUJPTChzeW0pIHN5bQotI2Vsc2UKLSNkZWZpbmUgUEFTVEUyKHgseSkgeCMjeQot I2RlZmluZSBQQVNURSh4LHkpIFBBU1RFMih4LHkpCi0jZGVmaW5lIEFTTV9TWU1CT0woc3ltKSBQ QVNURShTWU1CT0xfUFJFRklYLCBzeW0pCi0jZW5kaWYKKyNpbmNsdWRlIDxsaW51eC9leHBvcnQu aD4KIAogI2RlZmluZSBHTE9CQUwobmFtZSkJXAotCS5nbG9ibCBBU01fU1lNQk9MKG5hbWUpOwlc Ci0JQVNNX1NZTUJPTChuYW1lKToKKwkuZ2xvYmwgVk1MSU5VWF9TWU1CT0wobmFtZSk7CVwKKwlW TUxJTlVYX1NZTUJPTChuYW1lKToKIAogCS5zZWN0aW9uICIuaW5pdC5kYXRhIiwiYXciCiAKZGlm ZiAtLWdpdCBhL2tlcm5lbC9tb2R1bGUuYyBiL2tlcm5lbC9tb2R1bGUuYwppbmRleCAwOTI1Yzlh Li5jZmQ0YTNmIDEwMDY0NAotLS0gYS9rZXJuZWwvbW9kdWxlLmMKKysrIGIva2VybmVsL21vZHVs ZS5jCkBAIC0xMjA5LDcgKzEyMDksNyBAQCBzdGF0aWMgaW5saW5lIGludCBjaGVja19tb2RzdHJ1 Y3RfdmVyc2lvbihFbGZfU2hkciAqc2VjaGRycywKIAogCS8qIFNpbmNlIHRoaXMgc2hvdWxkIGJl IGZvdW5kIGluIGtlcm5lbCAod2hpY2ggY2FuJ3QgYmUgcmVtb3ZlZCksCiAJICogbm8gbG9ja2lu ZyBpcyBuZWNlc3NhcnkuICovCi0JaWYgKCFmaW5kX3N5bWJvbChNT0RVTEVfU1lNQk9MX1BSRUZJ WCAibW9kdWxlX2xheW91dCIsIE5VTEwsCisJaWYgKCFmaW5kX3N5bWJvbChWTUxJTlVYX1NZTUJP TF9TVFIobW9kdWxlX2xheW91dCksIE5VTEwsCiAJCQkgJmNyYywgdHJ1ZSwgZmFsc2UpKQogCQlC VUcoKTsKIAlyZXR1cm4gY2hlY2tfdmVyc2lvbihzZWNoZHJzLCB2ZXJzaW5kZXgsICJtb2R1bGVf bGF5b3V0IiwgbW9kLCBjcmMsCmRpZmYgLS1naXQgYS9zY3JpcHRzL01ha2VmaWxlLmxpYiBiL3Nj cmlwdHMvTWFrZWZpbGUubGliCmluZGV4IDA3MTI1ZTYuLmEzNzNhMWYgMTAwNjQ0Ci0tLSBhL3Nj cmlwdHMvTWFrZWZpbGUubGliCisrKyBiL3NjcmlwdHMvTWFrZWZpbGUubGliCkBAIC0xMTksMTMg KzExOSw2IEBAIF9jX2ZsYWdzICs9ICQoaWYgJChwYXRzdWJzdCBuJSwsIFwKIAkJJChDRkxBR1Nf R0NPVikpCiBlbmRpZgogCi1pZmRlZiBDT05GSUdfU1lNQk9MX1BSRUZJWAotX3N5bV9mbGFncyA9 IC1EU1lNQk9MX1BSRUZJWD0kKHBhdHN1YnN0ICIlIiwlLCQoQ09ORklHX1NZTUJPTF9QUkVGSVgp KQotX2NwcF9mbGFncyArPSAkKF9zeW1fZmxhZ3MpCi1fYV9mbGFncyArPSAkKF9zeW1fZmxhZ3Mp Ci1lbmRpZgotCi0KICMgSWYgYnVpbGRpbmcgdGhlIGtlcm5lbCBpbiBhIHNlcGFyYXRlIG9ianRy ZWUgZXhwYW5kIGFsbCBvY2N1cnJlbmNlcwogIyBvZiAtSWRpciB0byAtSSQoc3JjdHJlZSkvZGly IGV4Y2VwdCBmb3IgYWJzb2x1dGUgcGF0aHMgKHN0YXJ0aW5nIHdpdGggJy8nKS4KIApkaWZmIC0t Z2l0IGEvc2NyaXB0cy9saW5rLXZtbGludXguc2ggYi9zY3JpcHRzL2xpbmstdm1saW51eC5zaApp bmRleCAzZDU2OWQ2Li4wMTQ5OTQ5IDEwMDY0NAotLS0gYS9zY3JpcHRzL2xpbmstdm1saW51eC5z aAorKysgYi9zY3JpcHRzL2xpbmstdm1saW51eC5zaApAQCAtNzQsOSArNzQsOCBAQCBrYWxsc3lt cygpCiAJaW5mbyBLU1lNICR7Mn0KIAlsb2NhbCBrYWxsc3ltb3B0OwogCi0JaWYgWyAtbiAiJHtD T05GSUdfU1lNQk9MX1BSRUZJWH0iIF07IHRoZW4KLQkJa2FsbHN5bW9wdD0iJHtrYWxsc3ltb3B0 fSBcCi0JCQkgICAgLS1zeW1ib2wtcHJlZml4PSR7Q09ORklHX1NZTUJPTF9QUkVGSVh9IgorCWlm IFsgLW4gIiR7Q09ORklHX0hBVkVfVU5ERVJTQ09SRV9TWU1CT0xfUFJFRklYfSIgXTsgdGhlbgor CQlrYWxsc3ltb3B0PSIke2thbGxzeW1vcHR9IC0tc3ltYm9sLXByZWZpeD1fIgogCWZpCiAKIAlp ZiBbIC1uICIke0NPTkZJR19LQUxMU1lNU19BTEx9IiBdOyB0aGVuCmRpZmYgLS1naXQgYS9zY3Jp cHRzL21vZC9tb2Rwb3N0LmMgYi9zY3JpcHRzL21vZC9tb2Rwb3N0LmMKaW5kZXggNzhiMzBjMS4u Njk4NTAyMSAxMDA2NDQKLS0tIGEvc2NyaXB0cy9tb2QvbW9kcG9zdC5jCisrKyBiL3NjcmlwdHMv bW9kL21vZHBvc3QuYwpAQCAtMTgsMTQgKzE4LDcgQEAKICNpbmNsdWRlICJtb2Rwb3N0LmgiCiAj aW5jbHVkZSAiLi4vLi4vaW5jbHVkZS9nZW5lcmF0ZWQvYXV0b2NvbmYuaCIKICNpbmNsdWRlICIu Li8uLi9pbmNsdWRlL2xpbnV4L2xpY2Vuc2UuaCIKLQotLyogU29tZSB0b29sY2hhaW5zIHVzZSBh IGBfJyBwcmVmaXggZm9yIGFsbCB1c2VyIHN5bWJvbHMuICovCi0jaWZkZWYgQ09ORklHX1NZTUJP TF9QUkVGSVgKLSNkZWZpbmUgTU9EVUxFX1NZTUJPTF9QUkVGSVggQ09ORklHX1NZTUJPTF9QUkVG SVgKLSNlbHNlCi0jZGVmaW5lIE1PRFVMRV9TWU1CT0xfUFJFRklYICIiCi0jZW5kaWYKLQorI2lu Y2x1ZGUgIi4uLy4uL2luY2x1ZGUvbGludXgvZXhwb3J0LmgiCiAKIC8qIEFyZSB3ZSB1c2luZyBD T05GSUdfTU9EVkVSU0lPTlM/ICovCiBpbnQgbW9kdmVyc2lvbnMgPSAwOwpAQCAtNTYyLDcgKzU1 NSw3IEBAIHN0YXRpYyB2b2lkIHBhcnNlX2VsZl9maW5pc2goc3RydWN0IGVsZl9pbmZvICppbmZv KQogc3RhdGljIGludCBpZ25vcmVfdW5kZWZfc3ltYm9sKHN0cnVjdCBlbGZfaW5mbyAqaW5mbywg Y29uc3QgY2hhciAqc3ltbmFtZSkKIHsKIAkvKiBpZ25vcmUgX190aGlzX21vZHVsZSwgaXQgd2ls bCBiZSByZXNvbHZlZCBzaG9ydGx5ICovCi0JaWYgKHN0cmNtcChzeW1uYW1lLCBNT0RVTEVfU1lN Qk9MX1BSRUZJWCAiX190aGlzX21vZHVsZSIpID09IDApCisJaWYgKHN0cmNtcChzeW1uYW1lLCBW TUxJTlVYX1NZTUJPTF9TVFIoX190aGlzX21vZHVsZSkpID09IDApCiAJCXJldHVybiAxOwogCS8q IGlnbm9yZSBnbG9iYWwgb2Zmc2V0IHRhYmxlICovCiAJaWYgKHN0cmNtcChzeW1uYW1lLCAiX0dM T0JBTF9PRkZTRVRfVEFCTEVfIikgPT0gMCkKQEAgLTU4Myw4ICs1NzYsOCBAQCBzdGF0aWMgaW50 IGlnbm9yZV91bmRlZl9zeW1ib2woc3RydWN0IGVsZl9pbmZvICppbmZvLCBjb25zdCBjaGFyICpz eW1uYW1lKQogCXJldHVybiAwOwogfQogCi0jZGVmaW5lIENSQ19QRlggICAgIE1PRFVMRV9TWU1C T0xfUFJFRklYICJfX2NyY18iCi0jZGVmaW5lIEtTWU1UQUJfUEZYIE1PRFVMRV9TWU1CT0xfUFJF RklYICJfX2tzeW10YWJfIgorI2RlZmluZSBDUkNfUEZYICAgICBWTUxJTlVYX1NZTUJPTF9TVFIo X19jcmNfKQorI2RlZmluZSBLU1lNVEFCX1BGWCBWTUxJTlVYX1NZTUJPTF9TVFIoX19rc3ltdGFi XykKIAogc3RhdGljIHZvaWQgaGFuZGxlX21vZHZlcnNpb25zKHN0cnVjdCBtb2R1bGUgKm1vZCwg c3RydWN0IGVsZl9pbmZvICppbmZvLAogCQkJICAgICAgIEVsZl9TeW0gKnN5bSwgY29uc3QgY2hh ciAqc3ltbmFtZSkKQEAgLTYzNywxMSArNjMwLDExIEBAIHN0YXRpYyB2b2lkIGhhbmRsZV9tb2R2 ZXJzaW9ucyhzdHJ1Y3QgbW9kdWxlICptb2QsIHN0cnVjdCBlbGZfaW5mbyAqaW5mbywKIAkJfQog I2VuZGlmCiAKLQkJaWYgKG1lbWNtcChzeW1uYW1lLCBNT0RVTEVfU1lNQk9MX1BSRUZJWCwKLQkJ CSAgIHN0cmxlbihNT0RVTEVfU1lNQk9MX1BSRUZJWCkpID09IDApIHsKKwkJaWYgKG1lbWNtcChz eW1uYW1lLCBWTUxJTlVYX1NZTUJPTF9QUkVGSVhfU1RSLAorCQkJICAgc3RybGVuKFZNTElOVVhf U1lNQk9MX1BSRUZJWF9TVFIpKSA9PSAwKSB7CiAJCQltb2QtPnVucmVzID0KIAkJCSAgYWxsb2Nf c3ltYm9sKHN5bW5hbWUgKwotCQkJICAgICAgICAgICAgICAgc3RybGVuKE1PRFVMRV9TWU1CT0xf UFJFRklYKSwKKwkJCSAgICAgICAgICAgICAgIHN0cmxlbihWTUxJTlVYX1NZTUJPTF9QUkVGSVhf U1RSKSwKIAkJCSAgICAgICAgICAgICAgIEVMRl9TVF9CSU5EKHN5bS0+c3RfaW5mbykgPT0gU1RC X1dFQUssCiAJCQkgICAgICAgICAgICAgICBtb2QtPnVucmVzKTsKIAkJfQpAQCAtNjUyLDkgKzY0 NSw5IEBAIHN0YXRpYyB2b2lkIGhhbmRsZV9tb2R2ZXJzaW9ucyhzdHJ1Y3QgbW9kdWxlICptb2Qs IHN0cnVjdCBlbGZfaW5mbyAqaW5mbywKIAkJCXN5bV9hZGRfZXhwb3J0ZWQoc3ltbmFtZSArIHN0 cmxlbihLU1lNVEFCX1BGWCksIG1vZCwKIAkJCQkJZXhwb3J0KTsKIAkJfQotCQlpZiAoc3RyY21w KHN5bW5hbWUsIE1PRFVMRV9TWU1CT0xfUFJFRklYICJpbml0X21vZHVsZSIpID09IDApCisJCWlm IChzdHJjbXAoc3ltbmFtZSwgVk1MSU5VWF9TWU1CT0xfU1RSKGluaXRfbW9kdWxlKSkgPT0gMCkK IAkJCW1vZC0+aGFzX2luaXQgPSAxOwotCQlpZiAoc3RyY21wKHN5bW5hbWUsIE1PRFVMRV9TWU1C T0xfUFJFRklYICJjbGVhbnVwX21vZHVsZSIpID09IDApCisJCWlmIChzdHJjbXAoc3ltbmFtZSwg Vk1MSU5VWF9TWU1CT0xfU1RSKGNsZWFudXBfbW9kdWxlKSkgPT0gMCkKIAkJCW1vZC0+aGFzX2Ns ZWFudXAgPSAxOwogCQlicmVhazsKIAl9Ci0tCmNnaXQgdjAuOS4xCg== --f46d0444e97f814f0a04d7f4011a-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/