From mboxrd@z Thu Jan  1 00:00:00 1970
From: Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH] dma-buf: Rename dma-ops to prevent conflict
	with kunmap_atomic macro
Date: Tue, 18 Apr 2017 18:17:00 -0600
Message-ID: <1492561021-9533-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

U2VlaW5nIHRoZSBrdW5tYXBfYXRvbWljIGRtYV9idWZfb3Agc2hhcmVzIHRoZSBzYW1lIG5hbWUg
d2l0aCBhIG1hY3JvCmluIGhpZ21lbS5oLCB0aGUgZm9ybWVyIGNhbiBiZSBhbGlhc2VkIGlmIGFu
eSBkbWEtYnVmIHVzZXIgaW5jbHVkZXMKdGhhdCBoZWFkZXIuCgpJJ20gcGVyc29uYWxseSB0cnlp
bmcgdG8gaW5jbHVkZSBoaWdobWVtLmggaW5zaWRlIHNjYXR0ZXJsaXN0LmggYW5kIHRoaXMKYnJl
YWtzIHRoZSBkbWEtYnVmIGNvZGUgcHJvcGVyLgoKQ2hyaXN0b3BoIEhlbGx3aWcgc3VnZ2VzdGVk
IFsxXSByZW5hbWluZyBpdCBhbmQgcHVzaGluZyB0aGlzIHBhdGNoIEFTQVAuCgpUbyBtYWludGFp
biBjb25zaXN0ZW5jeSBJJ3ZlIHJlbmFtZWQgYWxsIGZvdXIgb2Yga21hcCogYW5kIGt1bm1hcCog
dG8gYmUKbWFwKiBhbmQgdW5tYXAqLiAoRXZlbiB0aG91Z2ggb25seSBrbWFwX2F0b21pYyBwcmVz
ZW50bHkgY29uZmxpY3RzLikKClsxXSBodHRwczovL3d3dy5zcGluaWNzLm5ldC9saXN0cy90YXJn
ZXQtZGV2ZWwvbXNnMTUwNzAuaHRtbAoKU2lnbmVkLW9mZi1ieTogTG9nYW4gR3VudGhvcnBlIDxs
b2dhbmdAZGVsdGF0ZWUuY29tPgotLS0KIGRyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVmLmMgICAgICAg
ICAgICAgICAgICAgICAgfCAxNiArKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYXJt
YWRhL2FybWFkYV9nZW0uYyAgICAgICAgICAgIHwgIDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2Ry
bS9kcm1fcHJpbWUuYyAgICAgICAgICAgICAgICAgICAgfCAgOCArKysrLS0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW1fZG1hYnVmLmMgICAgICAgICB8ICA4ICsrKystLS0tCiBkcml2
ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX2dlbV9kbWFidWYuYyAgICAgIHwgIDggKysrKy0tLS0K
IGRyaXZlcnMvZ3B1L2RybS90ZWdyYS9nZW0uYyAgICAgICAgICAgICAgICAgICAgfCAgNCArKy0t
CiBkcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kbWFidWYuYyAgICAgICAgICAgICAgIHwgIDggKysr
Ky0tLS0KIGRyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3ByaW1lLmMgICAgICAgICAgfCAg
OCArKysrLS0tLQogZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdmlkZW9idWYyLWRtYS1jb250aWcu
YyB8ICA0ICsrLS0KIGRyaXZlcnMvbWVkaWEvdjRsMi1jb3JlL3ZpZGVvYnVmMi1kbWEtc2cuYyAg
ICAgfCAgNCArKy0tCiBkcml2ZXJzL21lZGlhL3Y0bDItY29yZS92aWRlb2J1ZjItdm1hbGxvYy5j
ICAgIHwgIDQgKystLQogZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi5jICAgICAgICAg
ICAgICB8ICA4ICsrKystLS0tCiBpbmNsdWRlL2xpbnV4L2RtYS1idWYuaCAgICAgICAgICAgICAg
ICAgICAgICAgIHwgMjIgKysrKysrKysrKystLS0tLS0tLS0tLQogMTMgZmlsZXMgY2hhbmdlZCwg
NTUgaW5zZXJ0aW9ucygrKSwgNTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9k
bWEtYnVmL2RtYS1idWYuYyBiL2RyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVmLmMKaW5kZXggMDAwN2I3
OS4uN2NjMmJmZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYworKysgYi9k
cml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jCkBAIC00MDUsOCArNDA1LDggQEAgc3RydWN0IGRtYV9i
dWYgKmRtYV9idWZfZXhwb3J0KGNvbnN0IHN0cnVjdCBkbWFfYnVmX2V4cG9ydF9pbmZvICpleHBf
aW5mbykKIAkJCSAgfHwgIWV4cF9pbmZvLT5vcHMtPm1hcF9kbWFfYnVmCiAJCQkgIHx8ICFleHBf
aW5mby0+b3BzLT51bm1hcF9kbWFfYnVmCiAJCQkgIHx8ICFleHBfaW5mby0+b3BzLT5yZWxlYXNl
Ci0JCQkgIHx8ICFleHBfaW5mby0+b3BzLT5rbWFwX2F0b21pYwotCQkJICB8fCAhZXhwX2luZm8t
Pm9wcy0+a21hcAorCQkJICB8fCAhZXhwX2luZm8tPm9wcy0+bWFwX2F0b21pYworCQkJICB8fCAh
ZXhwX2luZm8tPm9wcy0+bWFwCiAJCQkgIHx8ICFleHBfaW5mby0+b3BzLT5tbWFwKSkgewogCQly
ZXR1cm4gRVJSX1BUUigtRUlOVkFMKTsKIAl9CkBAIC04NzIsNyArODcyLDcgQEAgdm9pZCAqZG1h
X2J1Zl9rbWFwX2F0b21pYyhzdHJ1Y3QgZG1hX2J1ZiAqZG1hYnVmLCB1bnNpZ25lZCBsb25nIHBh
Z2VfbnVtKQogewogCVdBUk5fT04oIWRtYWJ1Zik7CiAKLQlyZXR1cm4gZG1hYnVmLT5vcHMtPmtt
YXBfYXRvbWljKGRtYWJ1ZiwgcGFnZV9udW0pOworCXJldHVybiBkbWFidWYtPm9wcy0+bWFwX2F0
b21pYyhkbWFidWYsIHBhZ2VfbnVtKTsKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKGRtYV9idWZfa21h
cF9hdG9taWMpOwogCkBAIC04ODksOCArODg5LDggQEAgdm9pZCBkbWFfYnVmX2t1bm1hcF9hdG9t
aWMoc3RydWN0IGRtYV9idWYgKmRtYWJ1ZiwgdW5zaWduZWQgbG9uZyBwYWdlX251bSwKIHsKIAlX
QVJOX09OKCFkbWFidWYpOwogCi0JaWYgKGRtYWJ1Zi0+b3BzLT5rdW5tYXBfYXRvbWljKQotCQlk
bWFidWYtPm9wcy0+a3VubWFwX2F0b21pYyhkbWFidWYsIHBhZ2VfbnVtLCB2YWRkcik7CisJaWYg
KGRtYWJ1Zi0+b3BzLT51bm1hcF9hdG9taWMpCisJCWRtYWJ1Zi0+b3BzLT51bm1hcF9hdG9taWMo
ZG1hYnVmLCBwYWdlX251bSwgdmFkZHIpOwogfQogRVhQT1JUX1NZTUJPTF9HUEwoZG1hX2J1Zl9r
dW5tYXBfYXRvbWljKTsKIApAQCAtOTA3LDcgKzkwNyw3IEBAIHZvaWQgKmRtYV9idWZfa21hcChz
dHJ1Y3QgZG1hX2J1ZiAqZG1hYnVmLCB1bnNpZ25lZCBsb25nIHBhZ2VfbnVtKQogewogCVdBUk5f
T04oIWRtYWJ1Zik7CiAKLQlyZXR1cm4gZG1hYnVmLT5vcHMtPmttYXAoZG1hYnVmLCBwYWdlX251
bSk7CisJcmV0dXJuIGRtYWJ1Zi0+b3BzLT5tYXAoZG1hYnVmLCBwYWdlX251bSk7CiB9CiBFWFBP
UlRfU1lNQk9MX0dQTChkbWFfYnVmX2ttYXApOwogCkBAIC05MjQsOCArOTI0LDggQEAgdm9pZCBk
bWFfYnVmX2t1bm1hcChzdHJ1Y3QgZG1hX2J1ZiAqZG1hYnVmLCB1bnNpZ25lZCBsb25nIHBhZ2Vf
bnVtLAogewogCVdBUk5fT04oIWRtYWJ1Zik7CiAKLQlpZiAoZG1hYnVmLT5vcHMtPmt1bm1hcCkK
LQkJZG1hYnVmLT5vcHMtPmt1bm1hcChkbWFidWYsIHBhZ2VfbnVtLCB2YWRkcik7CisJaWYgKGRt
YWJ1Zi0+b3BzLT51bm1hcCkKKwkJZG1hYnVmLT5vcHMtPnVubWFwKGRtYWJ1ZiwgcGFnZV9udW0s
IHZhZGRyKTsKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKGRtYV9idWZfa3VubWFwKTsKIApkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFfZ2VtLmMgYi9kcml2ZXJzL2dwdS9k
cm0vYXJtYWRhL2FybWFkYV9nZW0uYwppbmRleCAxNTk3NDU4Li5kNmMyYTVkIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vYXJtYWRhL2FybWFkYV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vYXJtYWRhL2FybWFkYV9nZW0uYwpAQCAtNTI5LDEwICs1MjksMTAgQEAgc3RhdGljIGNvbnN0
IHN0cnVjdCBkbWFfYnVmX29wcyBhcm1hZGFfZ2VtX3ByaW1lX2RtYWJ1Zl9vcHMgPSB7CiAJLm1h
cF9kbWFfYnVmCT0gYXJtYWRhX2dlbV9wcmltZV9tYXBfZG1hX2J1ZiwKIAkudW5tYXBfZG1hX2J1
Zgk9IGFybWFkYV9nZW1fcHJpbWVfdW5tYXBfZG1hX2J1ZiwKIAkucmVsZWFzZQk9IGRybV9nZW1f
ZG1hYnVmX3JlbGVhc2UsCi0JLmttYXBfYXRvbWljCT0gYXJtYWRhX2dlbV9kbWFidWZfbm9fa21h
cCwKLQkua3VubWFwX2F0b21pYwk9IGFybWFkYV9nZW1fZG1hYnVmX25vX2t1bm1hcCwKLQkua21h
cAkJPSBhcm1hZGFfZ2VtX2RtYWJ1Zl9ub19rbWFwLAotCS5rdW5tYXAJCT0gYXJtYWRhX2dlbV9k
bWFidWZfbm9fa3VubWFwLAorCS5tYXBfYXRvbWljCT0gYXJtYWRhX2dlbV9kbWFidWZfbm9fa21h
cCwKKwkudW5tYXBfYXRvbWljCT0gYXJtYWRhX2dlbV9kbWFidWZfbm9fa3VubWFwLAorCS5tYXAJ
CT0gYXJtYWRhX2dlbV9kbWFidWZfbm9fa21hcCwKKwkudW5tYXAJCT0gYXJtYWRhX2dlbV9kbWFi
dWZfbm9fa3VubWFwLAogCS5tbWFwCQk9IGFybWFkYV9nZW1fZG1hYnVmX21tYXAsCiB9OwogCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMgYi9kcml2ZXJzL2dwdS9kcm0v
ZHJtX3ByaW1lLmMKaW5kZXggMjVhYTQ1NS4uNDhmZmQyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2RybV9wcmltZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYwpAQCAt
NDAyLDEwICs0MDIsMTAgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkbWFfYnVmX29wcyBkcm1fZ2Vt
X3ByaW1lX2RtYWJ1Zl9vcHMgPSAgewogCS5tYXBfZG1hX2J1ZiA9IGRybV9nZW1fbWFwX2RtYV9i
dWYsCiAJLnVubWFwX2RtYV9idWYgPSBkcm1fZ2VtX3VubWFwX2RtYV9idWYsCiAJLnJlbGVhc2Ug
PSBkcm1fZ2VtX2RtYWJ1Zl9yZWxlYXNlLAotCS5rbWFwID0gZHJtX2dlbV9kbWFidWZfa21hcCwK
LQkua21hcF9hdG9taWMgPSBkcm1fZ2VtX2RtYWJ1Zl9rbWFwX2F0b21pYywKLQkua3VubWFwID0g
ZHJtX2dlbV9kbWFidWZfa3VubWFwLAotCS5rdW5tYXBfYXRvbWljID0gZHJtX2dlbV9kbWFidWZf
a3VubWFwX2F0b21pYywKKwkubWFwID0gZHJtX2dlbV9kbWFidWZfa21hcCwKKwkubWFwX2F0b21p
YyA9IGRybV9nZW1fZG1hYnVmX2ttYXBfYXRvbWljLAorCS51bm1hcCA9IGRybV9nZW1fZG1hYnVm
X2t1bm1hcCwKKwkudW5tYXBfYXRvbWljID0gZHJtX2dlbV9kbWFidWZfa3VubWFwX2F0b21pYywK
IAkubW1hcCA9IGRybV9nZW1fZG1hYnVmX21tYXAsCiAJLnZtYXAgPSBkcm1fZ2VtX2RtYWJ1Zl92
bWFwLAogCS52dW5tYXAgPSBkcm1fZ2VtX2RtYWJ1Zl92dW5tYXAsCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9kbWFidWYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtX2RtYWJ1Zi5jCmluZGV4IDI5YmI4MDEuLjZmM2Q2NzQgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RtYWJ1Zi5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtX2RtYWJ1Zi5jCkBAIC0yMDAsMTAgKzIwMCwxMCBAQCBzdGF0aWMgY29u
c3Qgc3RydWN0IGRtYV9idWZfb3BzIGk5MTVfZG1hYnVmX29wcyA9ICB7CiAJLm1hcF9kbWFfYnVm
ID0gaTkxNV9nZW1fbWFwX2RtYV9idWYsCiAJLnVubWFwX2RtYV9idWYgPSBpOTE1X2dlbV91bm1h
cF9kbWFfYnVmLAogCS5yZWxlYXNlID0gZHJtX2dlbV9kbWFidWZfcmVsZWFzZSwKLQkua21hcCA9
IGk5MTVfZ2VtX2RtYWJ1Zl9rbWFwLAotCS5rbWFwX2F0b21pYyA9IGk5MTVfZ2VtX2RtYWJ1Zl9r
bWFwX2F0b21pYywKLQkua3VubWFwID0gaTkxNV9nZW1fZG1hYnVmX2t1bm1hcCwKLQkua3VubWFw
X2F0b21pYyA9IGk5MTVfZ2VtX2RtYWJ1Zl9rdW5tYXBfYXRvbWljLAorCS5tYXAgPSBpOTE1X2dl
bV9kbWFidWZfa21hcCwKKwkubWFwX2F0b21pYyA9IGk5MTVfZ2VtX2RtYWJ1Zl9rbWFwX2F0b21p
YywKKwkudW5tYXAgPSBpOTE1X2dlbV9kbWFidWZfa3VubWFwLAorCS51bm1hcF9hdG9taWMgPSBp
OTE1X2dlbV9kbWFidWZfa3VubWFwX2F0b21pYywKIAkubW1hcCA9IGk5MTVfZ2VtX2RtYWJ1Zl9t
bWFwLAogCS52bWFwID0gaTkxNV9nZW1fZG1hYnVmX3ZtYXAsCiAJLnZ1bm1hcCA9IGk5MTVfZ2Vt
X2RtYWJ1Zl92dW5tYXAsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFw
X2dlbV9kbWFidWYuYyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBfZ2VtX2RtYWJ1Zi5j
CmluZGV4IGVlNTg4M2YuLjBkYmUwMzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9vbWFw
ZHJtL29tYXBfZ2VtX2RtYWJ1Zi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBf
Z2VtX2RtYWJ1Zi5jCkBAIC0xNjAsMTAgKzE2MCwxMCBAQCBzdGF0aWMgc3RydWN0IGRtYV9idWZf
b3BzIG9tYXBfZG1hYnVmX29wcyA9IHsKIAkucmVsZWFzZSA9IG9tYXBfZ2VtX2RtYWJ1Zl9yZWxl
YXNlLAogCS5iZWdpbl9jcHVfYWNjZXNzID0gb21hcF9nZW1fZG1hYnVmX2JlZ2luX2NwdV9hY2Nl
c3MsCiAJLmVuZF9jcHVfYWNjZXNzID0gb21hcF9nZW1fZG1hYnVmX2VuZF9jcHVfYWNjZXNzLAot
CS5rbWFwX2F0b21pYyA9IG9tYXBfZ2VtX2RtYWJ1Zl9rbWFwX2F0b21pYywKLQkua3VubWFwX2F0
b21pYyA9IG9tYXBfZ2VtX2RtYWJ1Zl9rdW5tYXBfYXRvbWljLAotCS5rbWFwID0gb21hcF9nZW1f
ZG1hYnVmX2ttYXAsCi0JLmt1bm1hcCA9IG9tYXBfZ2VtX2RtYWJ1Zl9rdW5tYXAsCisJLm1hcF9h
dG9taWMgPSBvbWFwX2dlbV9kbWFidWZfa21hcF9hdG9taWMsCisJLnVubWFwX2F0b21pYyA9IG9t
YXBfZ2VtX2RtYWJ1Zl9rdW5tYXBfYXRvbWljLAorCS5tYXAgPSBvbWFwX2dlbV9kbWFidWZfa21h
cCwKKwkudW5tYXAgPSBvbWFwX2dlbV9kbWFidWZfa3VubWFwLAogCS5tbWFwID0gb21hcF9nZW1f
ZG1hYnVmX21tYXAsCiB9OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZ2Vt
LmMgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZ2VtLmMKaW5kZXggMTdlNjJlYy4uMTc4OGIxNCAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS90ZWdyYS9nZW0uYwpAQCAtMTEyLDggKzExMiw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg
aG9zdDF4X2JvX29wcyB0ZWdyYV9ib19vcHMgPSB7CiAJLnVucGluID0gdGVncmFfYm9fdW5waW4s
CiAJLm1tYXAgPSB0ZWdyYV9ib19tbWFwLAogCS5tdW5tYXAgPSB0ZWdyYV9ib19tdW5tYXAsCi0J
LmttYXAgPSB0ZWdyYV9ib19rbWFwLAotCS5rdW5tYXAgPSB0ZWdyYV9ib19rdW5tYXAsCisJLm1h
cCA9IHRlZ3JhX2JvX2ttYXAsCisJLnVubWFwID0gdGVncmFfYm9fa3VubWFwLAogfTsKIAogc3Rh
dGljIGludCB0ZWdyYV9ib19pb21tdV9tYXAoc3RydWN0IHRlZ3JhX2RybSAqdGVncmEsIHN0cnVj
dCB0ZWdyYV9ibyAqYm8pCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kbWFi
dWYuYyBiL2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2RtYWJ1Zi5jCmluZGV4IGFjOTBmZmQuLmVk
MGU2MzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2RtYWJ1Zi5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2RtYWJ1Zi5jCkBAIC0xOTEsMTAgKzE5MSwxMCBAQCBz
dGF0aWMgc3RydWN0IGRtYV9idWZfb3BzIHVkbF9kbWFidWZfb3BzID0gewogCS5kZXRhY2gJCQk9
IHVkbF9kZXRhY2hfZG1hX2J1ZiwKIAkubWFwX2RtYV9idWYJCT0gdWRsX21hcF9kbWFfYnVmLAog
CS51bm1hcF9kbWFfYnVmCQk9IHVkbF91bm1hcF9kbWFfYnVmLAotCS5rbWFwCQkJPSB1ZGxfZG1h
YnVmX2ttYXAsCi0JLmttYXBfYXRvbWljCQk9IHVkbF9kbWFidWZfa21hcF9hdG9taWMsCi0JLmt1
bm1hcAkJCT0gdWRsX2RtYWJ1Zl9rdW5tYXAsCi0JLmt1bm1hcF9hdG9taWMJCT0gdWRsX2RtYWJ1
Zl9rdW5tYXBfYXRvbWljLAorCS5tYXAJCQk9IHVkbF9kbWFidWZfa21hcCwKKwkubWFwX2F0b21p
YwkJPSB1ZGxfZG1hYnVmX2ttYXBfYXRvbWljLAorCS51bm1hcAkJCT0gdWRsX2RtYWJ1Zl9rdW5t
YXAsCisJLnVubWFwX2F0b21pYwkJPSB1ZGxfZG1hYnVmX2t1bm1hcF9hdG9taWMsCiAJLm1tYXAJ
CQk9IHVkbF9kbWFidWZfbW1hcCwKIAkucmVsZWFzZQkJPSBkcm1fZ2VtX2RtYWJ1Zl9yZWxlYXNl
LAogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3ByaW1lLmMg
Yi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9wcmltZS5jCmluZGV4IDMxZmUzMmQuLjBk
NDJhNDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3ByaW1lLmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfcHJpbWUuYwpAQCAtMTA4LDEwICsx
MDgsMTAgQEAgY29uc3Qgc3RydWN0IGRtYV9idWZfb3BzIHZtd19wcmltZV9kbWFidWZfb3BzID0g
IHsKIAkubWFwX2RtYV9idWYgPSB2bXdfcHJpbWVfbWFwX2RtYV9idWYsCiAJLnVubWFwX2RtYV9i
dWYgPSB2bXdfcHJpbWVfdW5tYXBfZG1hX2J1ZiwKIAkucmVsZWFzZSA9IE5VTEwsCi0JLmttYXAg
PSB2bXdfcHJpbWVfZG1hYnVmX2ttYXAsCi0JLmttYXBfYXRvbWljID0gdm13X3ByaW1lX2RtYWJ1
Zl9rbWFwX2F0b21pYywKLQkua3VubWFwID0gdm13X3ByaW1lX2RtYWJ1Zl9rdW5tYXAsCi0JLmt1
bm1hcF9hdG9taWMgPSB2bXdfcHJpbWVfZG1hYnVmX2t1bm1hcF9hdG9taWMsCisJLm1hcCA9IHZt
d19wcmltZV9kbWFidWZfa21hcCwKKwkubWFwX2F0b21pYyA9IHZtd19wcmltZV9kbWFidWZfa21h
cF9hdG9taWMsCisJLnVubWFwID0gdm13X3ByaW1lX2RtYWJ1Zl9rdW5tYXAsCisJLnVubWFwX2F0
b21pYyA9IHZtd19wcmltZV9kbWFidWZfa3VubWFwX2F0b21pYywKIAkubW1hcCA9IHZtd19wcmlt
ZV9kbWFidWZfbW1hcCwKIAkudm1hcCA9IHZtd19wcmltZV9kbWFidWZfdm1hcCwKIAkudnVubWFw
ID0gdm13X3ByaW1lX2RtYWJ1Zl92dW5tYXAsCmRpZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL3Y0
bDItY29yZS92aWRlb2J1ZjItZG1hLWNvbnRpZy5jIGIvZHJpdmVycy9tZWRpYS92NGwyLWNvcmUv
dmlkZW9idWYyLWRtYS1jb250aWcuYwppbmRleCBmYjZhMTc3Li4yZGIwNDEzIDEwMDY0NAotLS0g
YS9kcml2ZXJzL21lZGlhL3Y0bDItY29yZS92aWRlb2J1ZjItZG1hLWNvbnRpZy5jCisrKyBiL2Ry
aXZlcnMvbWVkaWEvdjRsMi1jb3JlL3ZpZGVvYnVmMi1kbWEtY29udGlnLmMKQEAgLTM1Niw4ICsz
NTYsOCBAQCBzdGF0aWMgc3RydWN0IGRtYV9idWZfb3BzIHZiMl9kY19kbWFidWZfb3BzID0gewog
CS5kZXRhY2ggPSB2YjJfZGNfZG1hYnVmX29wc19kZXRhY2gsCiAJLm1hcF9kbWFfYnVmID0gdmIy
X2RjX2RtYWJ1Zl9vcHNfbWFwLAogCS51bm1hcF9kbWFfYnVmID0gdmIyX2RjX2RtYWJ1Zl9vcHNf
dW5tYXAsCi0JLmttYXAgPSB2YjJfZGNfZG1hYnVmX29wc19rbWFwLAotCS5rbWFwX2F0b21pYyA9
IHZiMl9kY19kbWFidWZfb3BzX2ttYXAsCisJLm1hcCA9IHZiMl9kY19kbWFidWZfb3BzX2ttYXAs
CisJLm1hcF9hdG9taWMgPSB2YjJfZGNfZG1hYnVmX29wc19rbWFwLAogCS52bWFwID0gdmIyX2Rj
X2RtYWJ1Zl9vcHNfdm1hcCwKIAkubW1hcCA9IHZiMl9kY19kbWFidWZfb3BzX21tYXAsCiAJLnJl
bGVhc2UgPSB2YjJfZGNfZG1hYnVmX29wc19yZWxlYXNlLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9t
ZWRpYS92NGwyLWNvcmUvdmlkZW9idWYyLWRtYS1zZy5jIGIvZHJpdmVycy9tZWRpYS92NGwyLWNv
cmUvdmlkZW9idWYyLWRtYS1zZy5jCmluZGV4IGVjZmY4ZjQuLjZmZDEzNDMgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvbWVkaWEvdjRsMi1jb3JlL3ZpZGVvYnVmMi1kbWEtc2cuYworKysgYi9kcml2ZXJz
L21lZGlhL3Y0bDItY29yZS92aWRlb2J1ZjItZG1hLXNnLmMKQEAgLTUwNCw4ICs1MDQsOCBAQCBz
dGF0aWMgc3RydWN0IGRtYV9idWZfb3BzIHZiMl9kbWFfc2dfZG1hYnVmX29wcyA9IHsKIAkuZGV0
YWNoID0gdmIyX2RtYV9zZ19kbWFidWZfb3BzX2RldGFjaCwKIAkubWFwX2RtYV9idWYgPSB2YjJf
ZG1hX3NnX2RtYWJ1Zl9vcHNfbWFwLAogCS51bm1hcF9kbWFfYnVmID0gdmIyX2RtYV9zZ19kbWFi
dWZfb3BzX3VubWFwLAotCS5rbWFwID0gdmIyX2RtYV9zZ19kbWFidWZfb3BzX2ttYXAsCi0JLmtt
YXBfYXRvbWljID0gdmIyX2RtYV9zZ19kbWFidWZfb3BzX2ttYXAsCisJLm1hcCA9IHZiMl9kbWFf
c2dfZG1hYnVmX29wc19rbWFwLAorCS5tYXBfYXRvbWljID0gdmIyX2RtYV9zZ19kbWFidWZfb3Bz
X2ttYXAsCiAJLnZtYXAgPSB2YjJfZG1hX3NnX2RtYWJ1Zl9vcHNfdm1hcCwKIAkubW1hcCA9IHZi
Ml9kbWFfc2dfZG1hYnVmX29wc19tbWFwLAogCS5yZWxlYXNlID0gdmIyX2RtYV9zZ19kbWFidWZf
b3BzX3JlbGVhc2UsCmRpZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL3Y0bDItY29yZS92aWRlb2J1
ZjItdm1hbGxvYy5jIGIvZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdmlkZW9idWYyLXZtYWxsb2Mu
YwppbmRleCAzZjc3ODE0Li4yN2QxZGIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL21lZGlhL3Y0bDIt
Y29yZS92aWRlb2J1ZjItdm1hbGxvYy5jCisrKyBiL2RyaXZlcnMvbWVkaWEvdjRsMi1jb3JlL3Zp
ZGVvYnVmMi12bWFsbG9jLmMKQEAgLTM0Miw4ICszNDIsOCBAQCBzdGF0aWMgc3RydWN0IGRtYV9i
dWZfb3BzIHZiMl92bWFsbG9jX2RtYWJ1Zl9vcHMgPSB7CiAJLmRldGFjaCA9IHZiMl92bWFsbG9j
X2RtYWJ1Zl9vcHNfZGV0YWNoLAogCS5tYXBfZG1hX2J1ZiA9IHZiMl92bWFsbG9jX2RtYWJ1Zl9v
cHNfbWFwLAogCS51bm1hcF9kbWFfYnVmID0gdmIyX3ZtYWxsb2NfZG1hYnVmX29wc191bm1hcCwK
LQkua21hcCA9IHZiMl92bWFsbG9jX2RtYWJ1Zl9vcHNfa21hcCwKLQkua21hcF9hdG9taWMgPSB2
YjJfdm1hbGxvY19kbWFidWZfb3BzX2ttYXAsCisJLm1hcCA9IHZiMl92bWFsbG9jX2RtYWJ1Zl9v
cHNfa21hcCwKKwkubWFwX2F0b21pYyA9IHZiMl92bWFsbG9jX2RtYWJ1Zl9vcHNfa21hcCwKIAku
dm1hcCA9IHZiMl92bWFsbG9jX2RtYWJ1Zl9vcHNfdm1hcCwKIAkubW1hcCA9IHZiMl92bWFsbG9j
X2RtYWJ1Zl9vcHNfbW1hcCwKIAkucmVsZWFzZSA9IHZiMl92bWFsbG9jX2RtYWJ1Zl9vcHNfcmVs
ZWFzZSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb24uYyBiL2Ry
aXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb24uYwppbmRleCBmNDUxMTVmLi45NWE3ZjE2IDEw
MDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9pb24vaW9uLmMKKysrIGIvZHJpdmVy
cy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi5jCkBAIC0xMDIwLDEwICsxMDIwLDEwIEBAIHN0YXRp
YyBjb25zdCBzdHJ1Y3QgZG1hX2J1Zl9vcHMgZG1hX2J1Zl9vcHMgPSB7CiAJLnJlbGVhc2UgPSBp
b25fZG1hX2J1Zl9yZWxlYXNlLAogCS5iZWdpbl9jcHVfYWNjZXNzID0gaW9uX2RtYV9idWZfYmVn
aW5fY3B1X2FjY2VzcywKIAkuZW5kX2NwdV9hY2Nlc3MgPSBpb25fZG1hX2J1Zl9lbmRfY3B1X2Fj
Y2VzcywKLQkua21hcF9hdG9taWMgPSBpb25fZG1hX2J1Zl9rbWFwLAotCS5rdW5tYXBfYXRvbWlj
ID0gaW9uX2RtYV9idWZfa3VubWFwLAotCS5rbWFwID0gaW9uX2RtYV9idWZfa21hcCwKLQkua3Vu
bWFwID0gaW9uX2RtYV9idWZfa3VubWFwLAorCS5tYXBfYXRvbWljID0gaW9uX2RtYV9idWZfa21h
cCwKKwkudW5tYXBfYXRvbWljID0gaW9uX2RtYV9idWZfa3VubWFwLAorCS5tYXAgPSBpb25fZG1h
X2J1Zl9rbWFwLAorCS51bm1hcCA9IGlvbl9kbWFfYnVmX2t1bm1hcCwKIH07CiAKIHN0cnVjdCBk
bWFfYnVmICppb25fc2hhcmVfZG1hX2J1ZihzdHJ1Y3QgaW9uX2NsaWVudCAqY2xpZW50LApkaWZm
IC0tZ2l0IGEvaW5jbHVkZS9saW51eC9kbWEtYnVmLmggYi9pbmNsdWRlL2xpbnV4L2RtYS1idWYu
aAppbmRleCBiZmIzNzA0Li43OWYyN2Q2IDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L2RtYS1i
dWYuaAorKysgYi9pbmNsdWRlL2xpbnV4L2RtYS1idWYuaApAQCAtMzksMTMgKzM5LDEzIEBAIHN0
cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQ7CiAKIC8qKgogICogc3RydWN0IGRtYV9idWZfb3BzIC0g
b3BlcmF0aW9ucyBwb3NzaWJsZSBvbiBzdHJ1Y3QgZG1hX2J1ZgotICogQGttYXBfYXRvbWljOiBt
YXBzIGEgcGFnZSBmcm9tIHRoZSBidWZmZXIgaW50byBrZXJuZWwgYWRkcmVzcwotICogCQkgc3Bh
Y2UsIHVzZXJzIG1heSBub3QgYmxvY2sgdW50aWwgdGhlIHN1YnNlcXVlbnQgdW5tYXAgY2FsbC4K
LSAqIAkJIFRoaXMgY2FsbGJhY2sgbXVzdCBub3Qgc2xlZXAuCi0gKiBAa3VubWFwX2F0b21pYzog
W29wdGlvbmFsXSB1bm1hcHMgYSBhdG9taWNhbGx5IG1hcHBlZCBwYWdlIGZyb20gdGhlIGJ1ZmZl
ci4KLSAqIAkJICAgVGhpcyBDYWxsYmFjayBtdXN0IG5vdCBzbGVlcC4KLSAqIEBrbWFwOiBtYXBz
IGEgcGFnZSBmcm9tIHRoZSBidWZmZXIgaW50byBrZXJuZWwgYWRkcmVzcyBzcGFjZS4KLSAqIEBr
dW5tYXA6IFtvcHRpb25hbF0gdW5tYXBzIGEgcGFnZSBmcm9tIHRoZSBidWZmZXIuCisgKiBAbWFw
X2F0b21pYzogbWFwcyBhIHBhZ2UgZnJvbSB0aGUgYnVmZmVyIGludG8ga2VybmVsIGFkZHJlc3MK
KyAqCQlzcGFjZSwgdXNlcnMgbWF5IG5vdCBibG9jayB1bnRpbCB0aGUgc3Vic2VxdWVudCB1bm1h
cCBjYWxsLgorICoJCVRoaXMgY2FsbGJhY2sgbXVzdCBub3Qgc2xlZXAuCisgKiBAdW5tYXBfYXRv
bWljOiBbb3B0aW9uYWxdIHVubWFwcyBhIGF0b21pY2FsbHkgbWFwcGVkIHBhZ2UgZnJvbSB0aGUg
YnVmZmVyLgorICoJCSAgVGhpcyBDYWxsYmFjayBtdXN0IG5vdCBzbGVlcC4KKyAqIEBtYXA6IG1h
cHMgYSBwYWdlIGZyb20gdGhlIGJ1ZmZlciBpbnRvIGtlcm5lbCBhZGRyZXNzIHNwYWNlLgorICog
QHVubWFwOiBbb3B0aW9uYWxdIHVubWFwcyBhIHBhZ2UgZnJvbSB0aGUgYnVmZmVyLgogICogQHZt
YXA6IFtvcHRpb25hbF0gY3JlYXRlcyBhIHZpcnR1YWwgbWFwcGluZyBmb3IgdGhlIGJ1ZmZlciBp
bnRvIGtlcm5lbAogICoJICBhZGRyZXNzIHNwYWNlLiBTYW1lIHJlc3RyaWN0aW9ucyBhcyBmb3Ig
dm1hcCBhbmQgZnJpZW5kcyBhcHBseS4KICAqIEB2dW5tYXA6IFtvcHRpb25hbF0gdW5tYXBzIGEg
dm1hcCBmcm9tIHRoZSBidWZmZXIKQEAgLTIwNiwxMCArMjA2LDEwIEBAIHN0cnVjdCBkbWFfYnVm
X29wcyB7CiAJICogdG8gYmUgcmVzdGFydGVkLgogCSAqLwogCWludCAoKmVuZF9jcHVfYWNjZXNz
KShzdHJ1Y3QgZG1hX2J1ZiAqLCBlbnVtIGRtYV9kYXRhX2RpcmVjdGlvbik7Ci0Jdm9pZCAqKCpr
bWFwX2F0b21pYykoc3RydWN0IGRtYV9idWYgKiwgdW5zaWduZWQgbG9uZyk7Ci0Jdm9pZCAoKmt1
bm1hcF9hdG9taWMpKHN0cnVjdCBkbWFfYnVmICosIHVuc2lnbmVkIGxvbmcsIHZvaWQgKik7Ci0J
dm9pZCAqKCprbWFwKShzdHJ1Y3QgZG1hX2J1ZiAqLCB1bnNpZ25lZCBsb25nKTsKLQl2b2lkICgq
a3VubWFwKShzdHJ1Y3QgZG1hX2J1ZiAqLCB1bnNpZ25lZCBsb25nLCB2b2lkICopOworCXZvaWQg
KigqbWFwX2F0b21pYykoc3RydWN0IGRtYV9idWYgKiwgdW5zaWduZWQgbG9uZyk7CisJdm9pZCAo
KnVubWFwX2F0b21pYykoc3RydWN0IGRtYV9idWYgKiwgdW5zaWduZWQgbG9uZywgdm9pZCAqKTsK
Kwl2b2lkICooKm1hcCkoc3RydWN0IGRtYV9idWYgKiwgdW5zaWduZWQgbG9uZyk7CisJdm9pZCAo
KnVubWFwKShzdHJ1Y3QgZG1hX2J1ZiAqLCB1bnNpZ25lZCBsb25nLCB2b2lkICopOwogCiAJLyoq
CiAJICogQG1tYXA6Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu
Zm8vaW50ZWwtZ2Z4Cg==