From mboxrd@z Thu Jan  1 00:00:00 1970
From: Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v2] dma-buf: Rename dma-ops to prevent conflict
	with kunmap_atomic macro
Date: Wed, 19 Apr 2017 13:36:10 -0600
Message-ID: <1492630570-879-1-git-send-email-logang@deltatee.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, devel@driverdev.osuosl.org
Cc: David Airlie <airlied@linux.ie>, Thierry Reding <thierry.reding@gmail.com>, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>, Daniel Vetter <daniel.vetter@intel.com>, Sumit Semwal <sumit.semwal@linaro.org>, Marek Szyprowski <m.szyprowski@samsung.com>, Alexandre Courbot <gnurou@gmail.com>, Thomas Hellstrom <thellstrom@vmware.com>, Sinclair Yeh <syeh@vmware.com>, Russell King <linux@armlinux.org.uk>, Christoph Hellwig <hch@lst.de>, Tomi Valkeinen <tomi.valkeinen@ti.com>, VMware Graphics <linux-graphics-maintainer@vmware.com>, Laura Abbott <labbott@redhat.com>, Pawel Osciak <pawel@osciak.com>, Stephen Warren <swarren@wwwdotorg.org>, Riley Andrews <riandrews@android.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Kyungmin Park <kyungmin.park@samsung.com>, Logan Gunthorpe <logang@deltatee.com>
List-Id: linux-tegra@vger.kernel.org

U2VlaW5nIHRoZSBrdW5tYXBfYXRvbWljIGRtYV9idWZfb3BzIHNoYXJlIHRoZSBzYW1lIG5hbWUg
d2l0aCBhIG1hY3JvCmluIGhpZ2htZW0uaCwgdGhlIGZvcm1lciBjYW4gYmUgYWxpYXNlZCBpZiBh
bnkgZG1hLWJ1ZiB1c2VyIGluY2x1ZGVzCnRoYXQgaGVhZGVyLgoKSSdtIHBlcnNvbmFsbHkgdHJ5
aW5nIHRvIGluY2x1ZGUgaGlnaG1lbS5oIGluc2lkZSBzY2F0dGVybGlzdC5oIGFuZCB0aGlzCmJy
ZWFrcyB0aGUgZG1hLWJ1ZiBjb2RlIHByb3Blci4KCkNocmlzdG9waCBIZWxsd2lnIHN1Z2dlc3Rl
ZCBbMV0gcmVuYW1pbmcgaXQgYW5kIHB1c2hpbmcgdGhpcyBwYXRjaCBBU0FQLgoKVG8gbWFpbnRh
aW4gY29uc2lzdGVuY3kgSSd2ZSByZW5hbWVkIGFsbCBmb3VyIG9mIGttYXAqIGFuZCBrdW5tYXAq
IHRvIGJlCm1hcCogYW5kIHVubWFwKi4gKEV2ZW4gdGhvdWdoIG9ubHkga21hcF9hdG9taWMgcHJl
c2VudGx5IGNvbmZsaWN0cy4pCgpbMV0gaHR0cHM6Ly93d3cuc3Bpbmljcy5uZXQvbGlzdHMvdGFy
Z2V0LWRldmVsL21zZzE1MDcwLmh0bWwKClNpZ25lZC1vZmYtYnk6IExvZ2FuIEd1bnRob3JwZSA8
bG9nYW5nQGRlbHRhdGVlLmNvbT4KUmV2aWV3ZWQtYnk6IFNpbmNsYWlyIFllaCA8c3llaEB2bXdh
cmUuY29tPgotLS0KCkNoYW5nZXMgc2luY2UgdjE6CgotIEFkZGVkIHRoZSBtaXNzaW5nIHRlZ3Jh
IGRyaXZlciAobm90aWNlZCBieSBrYnVpbGQgcm9ib3QpCi0gUmViYXNlZCBvZmYgb2YgZHJtLWlu
dGVsLW5leHQgdG8gZ2V0IHRoZSBpOTE1IHNlbGZ0ZXN0IHRoYXQgaXMgbmV3Ci0gRml4ZWQgbml0
cyBTaW5jbGFpciBwb2ludGVkIG91dC4KCiBkcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jICAgICAg
ICAgICAgICAgICAgICAgIHwgMTYgKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2Fy
bWFkYS9hcm1hZGFfZ2VtLmMgICAgICAgICAgICB8ICA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9k
cm0vZHJtX3ByaW1lLmMgICAgICAgICAgICAgICAgICAgIHwgIDggKysrKy0tLS0KIGRyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RtYWJ1Zi5jICAgICAgICAgfCAgOCArKysrLS0tLQogZHJp
dmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZG1hYnVmLmMgICB8ICA4ICsrKystLS0t
CiBkcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX2dlbV9kbWFidWYuYyAgICAgIHwgIDggKysr
Ky0tLS0KIGRyaXZlcnMvZ3B1L2RybS90ZWdyYS9nZW0uYyAgICAgICAgICAgICAgICAgICAgfCAg
OCArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZG1hYnVmLmMgICAgICAgICAgICAg
ICB8ICA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9wcmltZS5jICAg
ICAgICAgIHwgIDggKysrKy0tLS0KIGRyaXZlcnMvbWVkaWEvdjRsMi1jb3JlL3ZpZGVvYnVmMi1k
bWEtY29udGlnLmMgfCAgNCArKy0tCiBkcml2ZXJzL21lZGlhL3Y0bDItY29yZS92aWRlb2J1ZjIt
ZG1hLXNnLmMgICAgIHwgIDQgKystLQogZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdmlkZW9idWYy
LXZtYWxsb2MuYyAgICB8ICA0ICsrLS0KIGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb24u
YyAgICAgICAgICAgICAgfCAgOCArKysrLS0tLQogaW5jbHVkZS9saW51eC9kbWEtYnVmLmggICAg
ICAgICAgICAgICAgICAgICAgICB8IDIyICsrKysrKysrKysrLS0tLS0tLS0tLS0KIDE0IGZpbGVz
IGNoYW5nZWQsIDYxIGluc2VydGlvbnMoKyksIDYxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVmLmMgYi9kcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jCmlu
ZGV4IGY3MmFhYWMuLjUxMmJkYmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVm
LmMKKysrIGIvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYwpAQCAtNDA1LDggKzQwNSw4IEBAIHN0
cnVjdCBkbWFfYnVmICpkbWFfYnVmX2V4cG9ydChjb25zdCBzdHJ1Y3QgZG1hX2J1Zl9leHBvcnRf
aW5mbyAqZXhwX2luZm8pCiAJCQkgIHx8ICFleHBfaW5mby0+b3BzLT5tYXBfZG1hX2J1ZgogCQkJ
ICB8fCAhZXhwX2luZm8tPm9wcy0+dW5tYXBfZG1hX2J1ZgogCQkJICB8fCAhZXhwX2luZm8tPm9w
cy0+cmVsZWFzZQotCQkJICB8fCAhZXhwX2luZm8tPm9wcy0+a21hcF9hdG9taWMKLQkJCSAgfHwg
IWV4cF9pbmZvLT5vcHMtPmttYXAKKwkJCSAgfHwgIWV4cF9pbmZvLT5vcHMtPm1hcF9hdG9taWMK
KwkJCSAgfHwgIWV4cF9pbmZvLT5vcHMtPm1hcAogCQkJICB8fCAhZXhwX2luZm8tPm9wcy0+bW1h
cCkpIHsKIAkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7CiAJfQpAQCAtODcyLDcgKzg3Miw3IEBA
IHZvaWQgKmRtYV9idWZfa21hcF9hdG9taWMoc3RydWN0IGRtYV9idWYgKmRtYWJ1ZiwgdW5zaWdu
ZWQgbG9uZyBwYWdlX251bSkKIHsKIAlXQVJOX09OKCFkbWFidWYpOwoKLQlyZXR1cm4gZG1hYnVm
LT5vcHMtPmttYXBfYXRvbWljKGRtYWJ1ZiwgcGFnZV9udW0pOworCXJldHVybiBkbWFidWYtPm9w
cy0+bWFwX2F0b21pYyhkbWFidWYsIHBhZ2VfbnVtKTsKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKGRt
YV9idWZfa21hcF9hdG9taWMpOwoKQEAgLTg4OSw4ICs4ODksOCBAQCB2b2lkIGRtYV9idWZfa3Vu
bWFwX2F0b21pYyhzdHJ1Y3QgZG1hX2J1ZiAqZG1hYnVmLCB1bnNpZ25lZCBsb25nIHBhZ2VfbnVt
LAogewogCVdBUk5fT04oIWRtYWJ1Zik7CgotCWlmIChkbWFidWYtPm9wcy0+a3VubWFwX2F0b21p
YykKLQkJZG1hYnVmLT5vcHMtPmt1bm1hcF9hdG9taWMoZG1hYnVmLCBwYWdlX251bSwgdmFkZHIp
OworCWlmIChkbWFidWYtPm9wcy0+dW5tYXBfYXRvbWljKQorCQlkbWFidWYtPm9wcy0+dW5tYXBf
YXRvbWljKGRtYWJ1ZiwgcGFnZV9udW0sIHZhZGRyKTsKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKGRt
YV9idWZfa3VubWFwX2F0b21pYyk7CgpAQCAtOTA3LDcgKzkwNyw3IEBAIHZvaWQgKmRtYV9idWZf
a21hcChzdHJ1Y3QgZG1hX2J1ZiAqZG1hYnVmLCB1bnNpZ25lZCBsb25nIHBhZ2VfbnVtKQogewog
CVdBUk5fT04oIWRtYWJ1Zik7CgotCXJldHVybiBkbWFidWYtPm9wcy0+a21hcChkbWFidWYsIHBh
Z2VfbnVtKTsKKwlyZXR1cm4gZG1hYnVmLT5vcHMtPm1hcChkbWFidWYsIHBhZ2VfbnVtKTsKIH0K
IEVYUE9SVF9TWU1CT0xfR1BMKGRtYV9idWZfa21hcCk7CgpAQCAtOTI0LDggKzkyNCw4IEBAIHZv
aWQgZG1hX2J1Zl9rdW5tYXAoc3RydWN0IGRtYV9idWYgKmRtYWJ1ZiwgdW5zaWduZWQgbG9uZyBw
YWdlX251bSwKIHsKIAlXQVJOX09OKCFkbWFidWYpOwoKLQlpZiAoZG1hYnVmLT5vcHMtPmt1bm1h
cCkKLQkJZG1hYnVmLT5vcHMtPmt1bm1hcChkbWFidWYsIHBhZ2VfbnVtLCB2YWRkcik7CisJaWYg
KGRtYWJ1Zi0+b3BzLT51bm1hcCkKKwkJZG1hYnVmLT5vcHMtPnVubWFwKGRtYWJ1ZiwgcGFnZV9u
dW0sIHZhZGRyKTsKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKGRtYV9idWZfa3VubWFwKTsKCmRpZmYg
LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYXJtYWRhL2FybWFkYV9nZW0uYyBiL2RyaXZlcnMvZ3B1
L2RybS9hcm1hZGEvYXJtYWRhX2dlbS5jCmluZGV4IDE1OTc0NTguLmQ2YzJhNWQgMTAwNjQ0Ci0t
LSBhL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9hcm1hZGEvYXJtYWRhX2dlbS5jCkBAIC01MjksMTAgKzUyOSwxMCBAQCBzdGF0aWMgY29u
c3Qgc3RydWN0IGRtYV9idWZfb3BzIGFybWFkYV9nZW1fcHJpbWVfZG1hYnVmX29wcyA9IHsKIAku
bWFwX2RtYV9idWYJPSBhcm1hZGFfZ2VtX3ByaW1lX21hcF9kbWFfYnVmLAogCS51bm1hcF9kbWFf
YnVmCT0gYXJtYWRhX2dlbV9wcmltZV91bm1hcF9kbWFfYnVmLAogCS5yZWxlYXNlCT0gZHJtX2dl
bV9kbWFidWZfcmVsZWFzZSwKLQkua21hcF9hdG9taWMJPSBhcm1hZGFfZ2VtX2RtYWJ1Zl9ub19r
bWFwLAotCS5rdW5tYXBfYXRvbWljCT0gYXJtYWRhX2dlbV9kbWFidWZfbm9fa3VubWFwLAotCS5r
bWFwCQk9IGFybWFkYV9nZW1fZG1hYnVmX25vX2ttYXAsCi0JLmt1bm1hcAkJPSBhcm1hZGFfZ2Vt
X2RtYWJ1Zl9ub19rdW5tYXAsCisJLm1hcF9hdG9taWMJPSBhcm1hZGFfZ2VtX2RtYWJ1Zl9ub19r
bWFwLAorCS51bm1hcF9hdG9taWMJPSBhcm1hZGFfZ2VtX2RtYWJ1Zl9ub19rdW5tYXAsCisJLm1h
cAkJPSBhcm1hZGFfZ2VtX2RtYWJ1Zl9ub19rbWFwLAorCS51bm1hcAkJPSBhcm1hZGFfZ2VtX2Rt
YWJ1Zl9ub19rdW5tYXAsCiAJLm1tYXAJCT0gYXJtYWRhX2dlbV9kbWFidWZfbW1hcCwKIH07Cgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9wcmltZS5jIGIvZHJpdmVycy9ncHUvZHJt
L2RybV9wcmltZS5jCmluZGV4IDlmYjY1YjcuLjk1NGViODQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9kcm1fcHJpbWUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKQEAg
LTQwMywxMCArNDAzLDEwIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZG1hX2J1Zl9vcHMgZHJtX2dl
bV9wcmltZV9kbWFidWZfb3BzID0gIHsKIAkubWFwX2RtYV9idWYgPSBkcm1fZ2VtX21hcF9kbWFf
YnVmLAogCS51bm1hcF9kbWFfYnVmID0gZHJtX2dlbV91bm1hcF9kbWFfYnVmLAogCS5yZWxlYXNl
ID0gZHJtX2dlbV9kbWFidWZfcmVsZWFzZSwKLQkua21hcCA9IGRybV9nZW1fZG1hYnVmX2ttYXAs
Ci0JLmttYXBfYXRvbWljID0gZHJtX2dlbV9kbWFidWZfa21hcF9hdG9taWMsCi0JLmt1bm1hcCA9
IGRybV9nZW1fZG1hYnVmX2t1bm1hcCwKLQkua3VubWFwX2F0b21pYyA9IGRybV9nZW1fZG1hYnVm
X2t1bm1hcF9hdG9taWMsCisJLm1hcCA9IGRybV9nZW1fZG1hYnVmX2ttYXAsCisJLm1hcF9hdG9t
aWMgPSBkcm1fZ2VtX2RtYWJ1Zl9rbWFwX2F0b21pYywKKwkudW5tYXAgPSBkcm1fZ2VtX2RtYWJ1
Zl9rdW5tYXAsCisJLnVubWFwX2F0b21pYyA9IGRybV9nZW1fZG1hYnVmX2t1bm1hcF9hdG9taWMs
CiAJLm1tYXAgPSBkcm1fZ2VtX2RtYWJ1Zl9tbWFwLAogCS52bWFwID0gZHJtX2dlbV9kbWFidWZf
dm1hcCwKIAkudnVubWFwID0gZHJtX2dlbV9kbWFidWZfdnVubWFwLApkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZG1hYnVmLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2dlbV9kbWFidWYuYwppbmRleCAxMTg5OGNkLi5mMjI1YmY2IDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9kbWFidWYuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2dlbV9kbWFidWYuYwpAQCAtMjAwLDEwICsyMDAsMTAgQEAgc3RhdGljIGNv
bnN0IHN0cnVjdCBkbWFfYnVmX29wcyBpOTE1X2RtYWJ1Zl9vcHMgPSAgewogCS5tYXBfZG1hX2J1
ZiA9IGk5MTVfZ2VtX21hcF9kbWFfYnVmLAogCS51bm1hcF9kbWFfYnVmID0gaTkxNV9nZW1fdW5t
YXBfZG1hX2J1ZiwKIAkucmVsZWFzZSA9IGRybV9nZW1fZG1hYnVmX3JlbGVhc2UsCi0JLmttYXAg
PSBpOTE1X2dlbV9kbWFidWZfa21hcCwKLQkua21hcF9hdG9taWMgPSBpOTE1X2dlbV9kbWFidWZf
a21hcF9hdG9taWMsCi0JLmt1bm1hcCA9IGk5MTVfZ2VtX2RtYWJ1Zl9rdW5tYXAsCi0JLmt1bm1h
cF9hdG9taWMgPSBpOTE1X2dlbV9kbWFidWZfa3VubWFwX2F0b21pYywKKwkubWFwID0gaTkxNV9n
ZW1fZG1hYnVmX2ttYXAsCisJLm1hcF9hdG9taWMgPSBpOTE1X2dlbV9kbWFidWZfa21hcF9hdG9t
aWMsCisJLnVubWFwID0gaTkxNV9nZW1fZG1hYnVmX2t1bm1hcCwKKwkudW5tYXBfYXRvbWljID0g
aTkxNV9nZW1fZG1hYnVmX2t1bm1hcF9hdG9taWMsCiAJLm1tYXAgPSBpOTE1X2dlbV9kbWFidWZf
bW1hcCwKIAkudm1hcCA9IGk5MTVfZ2VtX2RtYWJ1Zl92bWFwLAogCS52dW5tYXAgPSBpOTE1X2dl
bV9kbWFidWZfdnVubWFwLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRl
c3RzL21vY2tfZG1hYnVmLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19k
bWFidWYuYwppbmRleCA5OWRhOGY0Li4zMDJmN2QxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9zZWxmdGVzdHMvbW9ja19kbWFidWYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9zZWxmdGVzdHMvbW9ja19kbWFidWYuYwpAQCAtMTI5LDEwICsxMjksMTAgQEAgc3RhdGljIGNv
bnN0IHN0cnVjdCBkbWFfYnVmX29wcyBtb2NrX2RtYWJ1Zl9vcHMgPSAgewogCS5tYXBfZG1hX2J1
ZiA9IG1vY2tfbWFwX2RtYV9idWYsCiAJLnVubWFwX2RtYV9idWYgPSBtb2NrX3VubWFwX2RtYV9i
dWYsCiAJLnJlbGVhc2UgPSBtb2NrX2RtYWJ1Zl9yZWxlYXNlLAotCS5rbWFwID0gbW9ja19kbWFi
dWZfa21hcCwKLQkua21hcF9hdG9taWMgPSBtb2NrX2RtYWJ1Zl9rbWFwX2F0b21pYywKLQkua3Vu
bWFwID0gbW9ja19kbWFidWZfa3VubWFwLAotCS5rdW5tYXBfYXRvbWljID0gbW9ja19kbWFidWZf
a3VubWFwX2F0b21pYywKKwkubWFwID0gbW9ja19kbWFidWZfa21hcCwKKwkubWFwX2F0b21pYyA9
IG1vY2tfZG1hYnVmX2ttYXBfYXRvbWljLAorCS51bm1hcCA9IG1vY2tfZG1hYnVmX2t1bm1hcCwK
KwkudW5tYXBfYXRvbWljID0gbW9ja19kbWFidWZfa3VubWFwX2F0b21pYywKIAkubW1hcCA9IG1v
Y2tfZG1hYnVmX21tYXAsCiAJLnZtYXAgPSBtb2NrX2RtYWJ1Zl92bWFwLAogCS52dW5tYXAgPSBt
b2NrX2RtYWJ1Zl92dW5tYXAsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9v
bWFwX2dlbV9kbWFidWYuYyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBfZ2VtX2RtYWJ1
Zi5jCmluZGV4IGVlNTg4M2YuLjBkYmUwMzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9v
bWFwZHJtL29tYXBfZ2VtX2RtYWJ1Zi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29t
YXBfZ2VtX2RtYWJ1Zi5jCkBAIC0xNjAsMTAgKzE2MCwxMCBAQCBzdGF0aWMgc3RydWN0IGRtYV9i
dWZfb3BzIG9tYXBfZG1hYnVmX29wcyA9IHsKIAkucmVsZWFzZSA9IG9tYXBfZ2VtX2RtYWJ1Zl9y
ZWxlYXNlLAogCS5iZWdpbl9jcHVfYWNjZXNzID0gb21hcF9nZW1fZG1hYnVmX2JlZ2luX2NwdV9h
Y2Nlc3MsCiAJLmVuZF9jcHVfYWNjZXNzID0gb21hcF9nZW1fZG1hYnVmX2VuZF9jcHVfYWNjZXNz
LAotCS5rbWFwX2F0b21pYyA9IG9tYXBfZ2VtX2RtYWJ1Zl9rbWFwX2F0b21pYywKLQkua3VubWFw
X2F0b21pYyA9IG9tYXBfZ2VtX2RtYWJ1Zl9rdW5tYXBfYXRvbWljLAotCS5rbWFwID0gb21hcF9n
ZW1fZG1hYnVmX2ttYXAsCi0JLmt1bm1hcCA9IG9tYXBfZ2VtX2RtYWJ1Zl9rdW5tYXAsCisJLm1h
cF9hdG9taWMgPSBvbWFwX2dlbV9kbWFidWZfa21hcF9hdG9taWMsCisJLnVubWFwX2F0b21pYyA9
IG9tYXBfZ2VtX2RtYWJ1Zl9rdW5tYXBfYXRvbWljLAorCS5tYXAgPSBvbWFwX2dlbV9kbWFidWZf
a21hcCwKKwkudW5tYXAgPSBvbWFwX2dlbV9kbWFidWZfa3VubWFwLAogCS5tbWFwID0gb21hcF9n
ZW1fZG1hYnVmX21tYXAsCiB9OwoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9n
ZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9nZW0uYwppbmRleCAxN2U2MmVjLi44NjcyZjVk
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZ2VtLmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL3RlZ3JhL2dlbS5jCkBAIC02MTksMTAgKzYxOSwxMCBAQCBzdGF0aWMgY29uc3Qgc3Ry
dWN0IGRtYV9idWZfb3BzIHRlZ3JhX2dlbV9wcmltZV9kbWFidWZfb3BzID0gewogCS5tYXBfZG1h
X2J1ZiA9IHRlZ3JhX2dlbV9wcmltZV9tYXBfZG1hX2J1ZiwKIAkudW5tYXBfZG1hX2J1ZiA9IHRl
Z3JhX2dlbV9wcmltZV91bm1hcF9kbWFfYnVmLAogCS5yZWxlYXNlID0gdGVncmFfZ2VtX3ByaW1l
X3JlbGVhc2UsCi0JLmttYXBfYXRvbWljID0gdGVncmFfZ2VtX3ByaW1lX2ttYXBfYXRvbWljLAot
CS5rdW5tYXBfYXRvbWljID0gdGVncmFfZ2VtX3ByaW1lX2t1bm1hcF9hdG9taWMsCi0JLmttYXAg
PSB0ZWdyYV9nZW1fcHJpbWVfa21hcCwKLQkua3VubWFwID0gdGVncmFfZ2VtX3ByaW1lX2t1bm1h
cCwKKwkubWFwX2F0b21pYyA9IHRlZ3JhX2dlbV9wcmltZV9rbWFwX2F0b21pYywKKwkudW5tYXBf
YXRvbWljID0gdGVncmFfZ2VtX3ByaW1lX2t1bm1hcF9hdG9taWMsCisJLm1hcCA9IHRlZ3JhX2dl
bV9wcmltZV9rbWFwLAorCS51bm1hcCA9IHRlZ3JhX2dlbV9wcmltZV9rdW5tYXAsCiAJLm1tYXAg
PSB0ZWdyYV9nZW1fcHJpbWVfbW1hcCwKIAkudm1hcCA9IHRlZ3JhX2dlbV9wcmltZV92bWFwLAog
CS52dW5tYXAgPSB0ZWdyYV9nZW1fcHJpbWVfdnVubWFwLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL3VkbC91ZGxfZG1hYnVmLmMgYi9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kbWFidWYu
YwppbmRleCBhYzkwZmZkLi5lZDBlNjM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdWRs
L3VkbF9kbWFidWYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kbWFidWYuYwpAQCAt
MTkxLDEwICsxOTEsMTAgQEAgc3RhdGljIHN0cnVjdCBkbWFfYnVmX29wcyB1ZGxfZG1hYnVmX29w
cyA9IHsKIAkuZGV0YWNoCQkJPSB1ZGxfZGV0YWNoX2RtYV9idWYsCiAJLm1hcF9kbWFfYnVmCQk9
IHVkbF9tYXBfZG1hX2J1ZiwKIAkudW5tYXBfZG1hX2J1ZgkJPSB1ZGxfdW5tYXBfZG1hX2J1ZiwK
LQkua21hcAkJCT0gdWRsX2RtYWJ1Zl9rbWFwLAotCS5rbWFwX2F0b21pYwkJPSB1ZGxfZG1hYnVm
X2ttYXBfYXRvbWljLAotCS5rdW5tYXAJCQk9IHVkbF9kbWFidWZfa3VubWFwLAotCS5rdW5tYXBf
YXRvbWljCQk9IHVkbF9kbWFidWZfa3VubWFwX2F0b21pYywKKwkubWFwCQkJPSB1ZGxfZG1hYnVm
X2ttYXAsCisJLm1hcF9hdG9taWMJCT0gdWRsX2RtYWJ1Zl9rbWFwX2F0b21pYywKKwkudW5tYXAJ
CQk9IHVkbF9kbWFidWZfa3VubWFwLAorCS51bm1hcF9hdG9taWMJCT0gdWRsX2RtYWJ1Zl9rdW5t
YXBfYXRvbWljLAogCS5tbWFwCQkJPSB1ZGxfZG1hYnVmX21tYXAsCiAJLnJlbGVhc2UJCT0gZHJt
X2dlbV9kbWFidWZfcmVsZWFzZSwKIH07CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13
Z2Z4L3Ztd2dmeF9wcmltZS5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfcHJpbWUu
YwppbmRleCAzMWZlMzJkLi4wZDQyYTQ2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13
Z2Z4L3Ztd2dmeF9wcmltZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3By
aW1lLmMKQEAgLTEwOCwxMCArMTA4LDEwIEBAIGNvbnN0IHN0cnVjdCBkbWFfYnVmX29wcyB2bXdf
cHJpbWVfZG1hYnVmX29wcyA9ICB7CiAJLm1hcF9kbWFfYnVmID0gdm13X3ByaW1lX21hcF9kbWFf
YnVmLAogCS51bm1hcF9kbWFfYnVmID0gdm13X3ByaW1lX3VubWFwX2RtYV9idWYsCiAJLnJlbGVh
c2UgPSBOVUxMLAotCS5rbWFwID0gdm13X3ByaW1lX2RtYWJ1Zl9rbWFwLAotCS5rbWFwX2F0b21p
YyA9IHZtd19wcmltZV9kbWFidWZfa21hcF9hdG9taWMsCi0JLmt1bm1hcCA9IHZtd19wcmltZV9k
bWFidWZfa3VubWFwLAotCS5rdW5tYXBfYXRvbWljID0gdm13X3ByaW1lX2RtYWJ1Zl9rdW5tYXBf
YXRvbWljLAorCS5tYXAgPSB2bXdfcHJpbWVfZG1hYnVmX2ttYXAsCisJLm1hcF9hdG9taWMgPSB2
bXdfcHJpbWVfZG1hYnVmX2ttYXBfYXRvbWljLAorCS51bm1hcCA9IHZtd19wcmltZV9kbWFidWZf
a3VubWFwLAorCS51bm1hcF9hdG9taWMgPSB2bXdfcHJpbWVfZG1hYnVmX2t1bm1hcF9hdG9taWMs
CiAJLm1tYXAgPSB2bXdfcHJpbWVfZG1hYnVmX21tYXAsCiAJLnZtYXAgPSB2bXdfcHJpbWVfZG1h
YnVmX3ZtYXAsCiAJLnZ1bm1hcCA9IHZtd19wcmltZV9kbWFidWZfdnVubWFwLApkaWZmIC0tZ2l0
IGEvZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdmlkZW9idWYyLWRtYS1jb250aWcuYyBiL2RyaXZl
cnMvbWVkaWEvdjRsMi1jb3JlL3ZpZGVvYnVmMi1kbWEtY29udGlnLmMKaW5kZXggZmI2YTE3Ny4u
MmRiMDQxMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdmlkZW9idWYyLWRt
YS1jb250aWcuYworKysgYi9kcml2ZXJzL21lZGlhL3Y0bDItY29yZS92aWRlb2J1ZjItZG1hLWNv
bnRpZy5jCkBAIC0zNTYsOCArMzU2LDggQEAgc3RhdGljIHN0cnVjdCBkbWFfYnVmX29wcyB2YjJf
ZGNfZG1hYnVmX29wcyA9IHsKIAkuZGV0YWNoID0gdmIyX2RjX2RtYWJ1Zl9vcHNfZGV0YWNoLAog
CS5tYXBfZG1hX2J1ZiA9IHZiMl9kY19kbWFidWZfb3BzX21hcCwKIAkudW5tYXBfZG1hX2J1ZiA9
IHZiMl9kY19kbWFidWZfb3BzX3VubWFwLAotCS5rbWFwID0gdmIyX2RjX2RtYWJ1Zl9vcHNfa21h
cCwKLQkua21hcF9hdG9taWMgPSB2YjJfZGNfZG1hYnVmX29wc19rbWFwLAorCS5tYXAgPSB2YjJf
ZGNfZG1hYnVmX29wc19rbWFwLAorCS5tYXBfYXRvbWljID0gdmIyX2RjX2RtYWJ1Zl9vcHNfa21h
cCwKIAkudm1hcCA9IHZiMl9kY19kbWFidWZfb3BzX3ZtYXAsCiAJLm1tYXAgPSB2YjJfZGNfZG1h
YnVmX29wc19tbWFwLAogCS5yZWxlYXNlID0gdmIyX2RjX2RtYWJ1Zl9vcHNfcmVsZWFzZSwKZGlm
ZiAtLWdpdCBhL2RyaXZlcnMvbWVkaWEvdjRsMi1jb3JlL3ZpZGVvYnVmMi1kbWEtc2cuYyBiL2Ry
aXZlcnMvbWVkaWEvdjRsMi1jb3JlL3ZpZGVvYnVmMi1kbWEtc2cuYwppbmRleCBlY2ZmOGY0Li42
ZmQxMzQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL21lZGlhL3Y0bDItY29yZS92aWRlb2J1ZjItZG1h
LXNnLmMKKysrIGIvZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdmlkZW9idWYyLWRtYS1zZy5jCkBA
IC01MDQsOCArNTA0LDggQEAgc3RhdGljIHN0cnVjdCBkbWFfYnVmX29wcyB2YjJfZG1hX3NnX2Rt
YWJ1Zl9vcHMgPSB7CiAJLmRldGFjaCA9IHZiMl9kbWFfc2dfZG1hYnVmX29wc19kZXRhY2gsCiAJ
Lm1hcF9kbWFfYnVmID0gdmIyX2RtYV9zZ19kbWFidWZfb3BzX21hcCwKIAkudW5tYXBfZG1hX2J1
ZiA9IHZiMl9kbWFfc2dfZG1hYnVmX29wc191bm1hcCwKLQkua21hcCA9IHZiMl9kbWFfc2dfZG1h
YnVmX29wc19rbWFwLAotCS5rbWFwX2F0b21pYyA9IHZiMl9kbWFfc2dfZG1hYnVmX29wc19rbWFw
LAorCS5tYXAgPSB2YjJfZG1hX3NnX2RtYWJ1Zl9vcHNfa21hcCwKKwkubWFwX2F0b21pYyA9IHZi
Ml9kbWFfc2dfZG1hYnVmX29wc19rbWFwLAogCS52bWFwID0gdmIyX2RtYV9zZ19kbWFidWZfb3Bz
X3ZtYXAsCiAJLm1tYXAgPSB2YjJfZG1hX3NnX2RtYWJ1Zl9vcHNfbW1hcCwKIAkucmVsZWFzZSA9
IHZiMl9kbWFfc2dfZG1hYnVmX29wc19yZWxlYXNlLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZWRp
YS92NGwyLWNvcmUvdmlkZW9idWYyLXZtYWxsb2MuYyBiL2RyaXZlcnMvbWVkaWEvdjRsMi1jb3Jl
L3ZpZGVvYnVmMi12bWFsbG9jLmMKaW5kZXggM2Y3NzgxNC4uMjdkMWRiMyAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdmlkZW9idWYyLXZtYWxsb2MuYworKysgYi9kcml2ZXJz
L21lZGlhL3Y0bDItY29yZS92aWRlb2J1ZjItdm1hbGxvYy5jCkBAIC0zNDIsOCArMzQyLDggQEAg
c3RhdGljIHN0cnVjdCBkbWFfYnVmX29wcyB2YjJfdm1hbGxvY19kbWFidWZfb3BzID0gewogCS5k
ZXRhY2ggPSB2YjJfdm1hbGxvY19kbWFidWZfb3BzX2RldGFjaCwKIAkubWFwX2RtYV9idWYgPSB2
YjJfdm1hbGxvY19kbWFidWZfb3BzX21hcCwKIAkudW5tYXBfZG1hX2J1ZiA9IHZiMl92bWFsbG9j
X2RtYWJ1Zl9vcHNfdW5tYXAsCi0JLmttYXAgPSB2YjJfdm1hbGxvY19kbWFidWZfb3BzX2ttYXAs
Ci0JLmttYXBfYXRvbWljID0gdmIyX3ZtYWxsb2NfZG1hYnVmX29wc19rbWFwLAorCS5tYXAgPSB2
YjJfdm1hbGxvY19kbWFidWZfb3BzX2ttYXAsCisJLm1hcF9hdG9taWMgPSB2YjJfdm1hbGxvY19k
bWFidWZfb3BzX2ttYXAsCiAJLnZtYXAgPSB2YjJfdm1hbGxvY19kbWFidWZfb3BzX3ZtYXAsCiAJ
Lm1tYXAgPSB2YjJfdm1hbGxvY19kbWFidWZfb3BzX21tYXAsCiAJLnJlbGVhc2UgPSB2YjJfdm1h
bGxvY19kbWFidWZfb3BzX3JlbGVhc2UsCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvYW5k
cm9pZC9pb24vaW9uLmMgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9pb24vaW9uLmMKaW5kZXgg
ZjQ1MTE1Zi4uOTVhN2YxNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9u
L2lvbi5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb24uYwpAQCAtMTAyMCwx
MCArMTAyMCwxMCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRtYV9idWZfb3BzIGRtYV9idWZfb3Bz
ID0gewogCS5yZWxlYXNlID0gaW9uX2RtYV9idWZfcmVsZWFzZSwKIAkuYmVnaW5fY3B1X2FjY2Vz
cyA9IGlvbl9kbWFfYnVmX2JlZ2luX2NwdV9hY2Nlc3MsCiAJLmVuZF9jcHVfYWNjZXNzID0gaW9u
X2RtYV9idWZfZW5kX2NwdV9hY2Nlc3MsCi0JLmttYXBfYXRvbWljID0gaW9uX2RtYV9idWZfa21h
cCwKLQkua3VubWFwX2F0b21pYyA9IGlvbl9kbWFfYnVmX2t1bm1hcCwKLQkua21hcCA9IGlvbl9k
bWFfYnVmX2ttYXAsCi0JLmt1bm1hcCA9IGlvbl9kbWFfYnVmX2t1bm1hcCwKKwkubWFwX2F0b21p
YyA9IGlvbl9kbWFfYnVmX2ttYXAsCisJLnVubWFwX2F0b21pYyA9IGlvbl9kbWFfYnVmX2t1bm1h
cCwKKwkubWFwID0gaW9uX2RtYV9idWZfa21hcCwKKwkudW5tYXAgPSBpb25fZG1hX2J1Zl9rdW5t
YXAsCiB9OwoKIHN0cnVjdCBkbWFfYnVmICppb25fc2hhcmVfZG1hX2J1ZihzdHJ1Y3QgaW9uX2Ns
aWVudCAqY2xpZW50LApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9kbWEtYnVmLmggYi9pbmNs
dWRlL2xpbnV4L2RtYS1idWYuaAppbmRleCBiZmIzNzA0Li43OWYyN2Q2IDEwMDY0NAotLS0gYS9p
bmNsdWRlL2xpbnV4L2RtYS1idWYuaAorKysgYi9pbmNsdWRlL2xpbnV4L2RtYS1idWYuaApAQCAt
MzksMTMgKzM5LDEzIEBAIHN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQ7CgogLyoqCiAgKiBzdHJ1
Y3QgZG1hX2J1Zl9vcHMgLSBvcGVyYXRpb25zIHBvc3NpYmxlIG9uIHN0cnVjdCBkbWFfYnVmCi0g
KiBAa21hcF9hdG9taWM6IG1hcHMgYSBwYWdlIGZyb20gdGhlIGJ1ZmZlciBpbnRvIGtlcm5lbCBh
ZGRyZXNzCi0gKiAJCSBzcGFjZSwgdXNlcnMgbWF5IG5vdCBibG9jayB1bnRpbCB0aGUgc3Vic2Vx
dWVudCB1bm1hcCBjYWxsLgotICogCQkgVGhpcyBjYWxsYmFjayBtdXN0IG5vdCBzbGVlcC4KLSAq
IEBrdW5tYXBfYXRvbWljOiBbb3B0aW9uYWxdIHVubWFwcyBhIGF0b21pY2FsbHkgbWFwcGVkIHBh
Z2UgZnJvbSB0aGUgYnVmZmVyLgotICogCQkgICBUaGlzIENhbGxiYWNrIG11c3Qgbm90IHNsZWVw
LgotICogQGttYXA6IG1hcHMgYSBwYWdlIGZyb20gdGhlIGJ1ZmZlciBpbnRvIGtlcm5lbCBhZGRy
ZXNzIHNwYWNlLgotICogQGt1bm1hcDogW29wdGlvbmFsXSB1bm1hcHMgYSBwYWdlIGZyb20gdGhl
IGJ1ZmZlci4KKyAqIEBtYXBfYXRvbWljOiBtYXBzIGEgcGFnZSBmcm9tIHRoZSBidWZmZXIgaW50
byBrZXJuZWwgYWRkcmVzcworICoJCXNwYWNlLCB1c2VycyBtYXkgbm90IGJsb2NrIHVudGlsIHRo
ZSBzdWJzZXF1ZW50IHVubWFwIGNhbGwuCisgKgkJVGhpcyBjYWxsYmFjayBtdXN0IG5vdCBzbGVl
cC4KKyAqIEB1bm1hcF9hdG9taWM6IFtvcHRpb25hbF0gdW5tYXBzIGEgYXRvbWljYWxseSBtYXBw
ZWQgcGFnZSBmcm9tIHRoZSBidWZmZXIuCisgKgkJICBUaGlzIENhbGxiYWNrIG11c3Qgbm90IHNs
ZWVwLgorICogQG1hcDogbWFwcyBhIHBhZ2UgZnJvbSB0aGUgYnVmZmVyIGludG8ga2VybmVsIGFk
ZHJlc3Mgc3BhY2UuCisgKiBAdW5tYXA6IFtvcHRpb25hbF0gdW5tYXBzIGEgcGFnZSBmcm9tIHRo
ZSBidWZmZXIuCiAgKiBAdm1hcDogW29wdGlvbmFsXSBjcmVhdGVzIGEgdmlydHVhbCBtYXBwaW5n
IGZvciB0aGUgYnVmZmVyIGludG8ga2VybmVsCiAgKgkgIGFkZHJlc3Mgc3BhY2UuIFNhbWUgcmVz
dHJpY3Rpb25zIGFzIGZvciB2bWFwIGFuZCBmcmllbmRzIGFwcGx5LgogICogQHZ1bm1hcDogW29w
dGlvbmFsXSB1bm1hcHMgYSB2bWFwIGZyb20gdGhlIGJ1ZmZlcgpAQCAtMjA2LDEwICsyMDYsMTAg
QEAgc3RydWN0IGRtYV9idWZfb3BzIHsKIAkgKiB0byBiZSByZXN0YXJ0ZWQuCiAJICovCiAJaW50
ICgqZW5kX2NwdV9hY2Nlc3MpKHN0cnVjdCBkbWFfYnVmICosIGVudW0gZG1hX2RhdGFfZGlyZWN0
aW9uKTsKLQl2b2lkICooKmttYXBfYXRvbWljKShzdHJ1Y3QgZG1hX2J1ZiAqLCB1bnNpZ25lZCBs
b25nKTsKLQl2b2lkICgqa3VubWFwX2F0b21pYykoc3RydWN0IGRtYV9idWYgKiwgdW5zaWduZWQg
bG9uZywgdm9pZCAqKTsKLQl2b2lkICooKmttYXApKHN0cnVjdCBkbWFfYnVmICosIHVuc2lnbmVk
IGxvbmcpOwotCXZvaWQgKCprdW5tYXApKHN0cnVjdCBkbWFfYnVmICosIHVuc2lnbmVkIGxvbmcs
IHZvaWQgKik7CisJdm9pZCAqKCptYXBfYXRvbWljKShzdHJ1Y3QgZG1hX2J1ZiAqLCB1bnNpZ25l
ZCBsb25nKTsKKwl2b2lkICgqdW5tYXBfYXRvbWljKShzdHJ1Y3QgZG1hX2J1ZiAqLCB1bnNpZ25l
ZCBsb25nLCB2b2lkICopOworCXZvaWQgKigqbWFwKShzdHJ1Y3QgZG1hX2J1ZiAqLCB1bnNpZ25l
ZCBsb25nKTsKKwl2b2lkICgqdW5tYXApKHN0cnVjdCBkbWFfYnVmICosIHVuc2lnbmVkIGxvbmcs
IHZvaWQgKik7CgogCS8qKgogCSAqIEBtbWFwOgotLQoyLjEuNApfX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs
LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv
bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK