Y29tbWl0IDEwMTNlMmVhODgzODRkYTJlNzMyNmY0MDA0N2JiYzkyZGViOWU1MTYNCkF1dGhvcjog
TWFyYyBFc2hlbCA8ZXNoZWxAYWxtYWRlbi5pYm0uY29tPg0KRGF0ZTogICBGcmkgRGVjIDcgMTU6
NTg6MDcgMjAxMiAtMDgwMA0KDQpDaGFuZ2UgZGVmaW5pdGlvbiBvZiBub3RpZnlfZGV2aWNlaWRf
dHlwZTQgdG8gY29ycmVzcG9uZCB0byB0aGUgTkZTdjQuMSANCnNwZWMuDQoNClNpZ25lZC1vZmYt
Ynk6IE1hcmMgRXNoZWwgPGVzaGVsQHVzLmlibS5jb20+DQotLS0NCg0KZGlmZiAtLWdpdCBhL2lu
Y2x1ZGUvbGludXgvbmZzNC5oIGIvaW5jbHVkZS9saW51eC9uZnM0LmgNCmluZGV4IDU5Y2M4MzMu
LmFkMzJkZjUgMTAwNjQ0DQotLS0gYS9pbmNsdWRlL2xpbnV4L25mczQuaA0KKysrIGIvaW5jbHVk
ZS9saW51eC9uZnM0LmgNCkBAIC00OTksOCArNDk5LDggQEAgZW51bSBwbmZzX2lvbW9kZSB7DQog
fTsNCg0KIGVudW0gcG5mc19ub3RpZnlfZGV2aWNlaWRfdHlwZTQgew0KLSAgICAgICBOT1RJRllf
REVWSUNFSUQ0X0NIQU5HRSA9IDEgPDwgMSwNCi0gICAgICAgTk9USUZZX0RFVklDRUlENF9ERUxF
VEUgPSAxIDw8IDIsDQorICAgICAgIE5PVElGWV9ERVZJQ0VJRDRfQ0hBTkdFID0gMSwNCisgICAg
ICAgTk9USUZZX0RFVklDRUlENF9ERUxFVEUgPSAyLA0KIH07DQoNCiAjZGVmaW5lIE5GTDRfVUZM
R19NQVNLICAgICAgICAgICAgICAgICAweDAwMDAwMDNGDQoNCg0KDQpGcm9tOiAgICJNeWtsZWJ1
c3QsIFRyb25kIiA8VHJvbmQuTXlrbGVidXN0QG5ldGFwcC5jb20+DQpUbzogICAgIE1hcmMgRXNo
ZWwvQWxtYWRlbi9JQk1ASUJNVVMsIA0KQ2M6ICAgICAiSi4gQnJ1Y2UgRmllbGRzIiA8YmZpZWxk
c0ByZWRoYXQuY29tPiwgDQoibGludXgtbmZzQHZnZXIua2VybmVsLm9yZyIgPGxpbnV4LW5mc0B2
Z2VyLmtlcm5lbC5vcmc+LCANCiJsaW51eC1uZnMtb3duZXJAdmdlci5rZXJuZWwub3JnIiA8bGlu
dXgtbmZzLW93bmVyQHZnZXIua2VybmVsLm9yZz4NCkRhdGU6ICAgMTIvMDcvMjAxMiAwMzo0NSBQ
TQ0KU3ViamVjdDogICAgICAgIFJFOiBub3RpZnlfZGV2aWNlaWRfdHlwZTQNCg0KDQoNCkhpIE1h
cmMsDQogDQpJ4oCZdmUgYmVlbiB3YWl0aW5nIGZvciBhIHBhdGNoIGZyb20geW91IGZvciB0aGlz
IChJIHNhdyB5b3VyIG9yaWdpbmFsIGJ1ZyANCnJlcG9ydCkuIENvdWxkIHlvdSBwbGVhc2UgcmVz
ZW5kIHdpdGggYSBmb3JtYWwgY2hhbmdlbG9nIGVudHJ5IGFuZCANCnNpZ25lZC1vZmYtYnkgbGlu
ZT8gSSBrbm93IHRoYXQgd291bGQgbWFrZSB5b3VyIGxlZ2FsIGNvbGxlYWd1ZXMgaW4gSUJNIA0K
dmVyeSBoYXBweS4gSg0KIA0KQ2hlZXJzDQogIFRyb25kDQogDQpGcm9tOiBNYXJjIEVzaGVsIFtt
YWlsdG86ZXNoZWxAdXMuaWJtLmNvbV0gDQpTZW50OiBTYXR1cmRheSwgRGVjZW1iZXIgMDgsIDIw
MTIgMTI6MzMgQU0NClRvOiBNeWtsZWJ1c3QsIFRyb25kDQpDYzogSi4gQnJ1Y2UgRmllbGRzOyBs
aW51eC1uZnNAdmdlci5rZXJuZWwub3JnOyANCmxpbnV4LW5mcy1vd25lckB2Z2VyLmtlcm5lbC5v
cmcNClN1YmplY3Q6IFJlOiBub3RpZnlfZGV2aWNlaWRfdHlwZTQNCiANClRyb25kLCBjYW4geW91
IHBsZWFzZSBhcHBseSB0aGUgZm9sbG93aW5nIHBhdGNoIHNvIHdlIGFyZSBpbiBjb21wbGlhbmNl
IA0Kd2l0aCB0aGUgc3BlYy4gDQpUaGFua3MsIE1hcmMuIA0KDQpkaWZmIC0tZ2l0IGEvaW5jbHVk
ZS9saW51eC9uZnM0LmggYi9pbmNsdWRlL2xpbnV4L25mczQuaCANCmluZGV4IDU5Y2M4MzMuLmFk
MzJkZjUgMTAwNjQ0IA0KLS0tIGEvaW5jbHVkZS9saW51eC9uZnM0LmggDQorKysgYi9pbmNsdWRl
L2xpbnV4L25mczQuaCANCkBAIC00OTksOCArNDk5LDggQEAgZW51bSBwbmZzX2lvbW9kZSB7IA0K
IH07IA0KICANCiBlbnVtIHBuZnNfbm90aWZ5X2RldmljZWlkX3R5cGU0IHsgDQotICAgICAgIE5P
VElGWV9ERVZJQ0VJRDRfQ0hBTkdFID0gMSA8PCAxLCANCi0gICAgICAgTk9USUZZX0RFVklDRUlE
NF9ERUxFVEUgPSAxIDw8IDIsIA0KKyAgICAgICBOT1RJRllfREVWSUNFSUQ0X0NIQU5HRSA9IDEs
IA0KKyAgICAgICBOT1RJRllfREVWSUNFSUQ0X0RFTEVURSA9IDIsIA0KIH07IA0KICANCiAjZGVm
aW5lIE5GTDRfVUZMR19NQVNLICAgICAgICAgICAgICAgICAweDAwMDAwMDNGIA0KDQoNCg0KRnJv
bTogICAgICAgIE1hcmMgRXNoZWwvQWxtYWRlbi9JQk0gDQpUbzogICAgICAgICJUcm9uZCBNeWts
ZWJ1c3QiIDxUcm9uZC5NeWtsZWJ1c3RAbmV0YXBwLmNvbT4sICJKLiBCcnVjZSANCkZpZWxkcyIg
PGJmaWVsZHNAcmVkaGF0LmNvbT4sIA0KQ2M6ICAgICAgICBsaW51eC1uZnMtb3duZXJAdmdlci5r
ZXJuZWwub3JnLCBsaW51eC1uZnNAdmdlci5rZXJuZWwub3JnIA0KRGF0ZTogICAgICAgIDExLzMw
LzIwMTIgMDk6NTQgUE0gDQpTdWJqZWN0OiAgICAgICAgbm90aWZ5X2RldmljZWlkX3R5cGU0IA0K
DQoNCg0KVGhlIHNwZWMgZGVmaW5lcyBub3RpZnlfZGV2aWNlaWRfdHlwZTQgYXM6IA0KDQoyMC4x
Mi4xLiAgQVJHVU1FTlQNCiAgLyoNCiAgICogRGV2aWNlIG5vdGlmaWNhdGlvbiB0eXBlcy4NCiAg
ICovDQogIGVudW0gbm90aWZ5X2RldmljZWlkX3R5cGU0IHsNCiAgICAgICAgICBOT1RJRllfREVW
SUNFSUQ0X0NIQU5HRSA9IDEsDQogICAgICAgICAgTk9USUZZX0RFVklDRUlENF9ERUxFVEUgPSAy
DQogIH07IA0KDQoNCmJ1dCB0aGUgTGludXggY29kZSBpbiBuZnM0LmggaGFzLCBpcyB0aGF0IGdv
aW5nIHRvIGJlIGZpeGVkPyANCg0KZW51bSBwbmZzX25vdGlmeV9kZXZpY2VpZF90eXBlNCB7IA0K
ICAgICAgICBOT1RJRllfREVWSUNFSUQ0X0NIQU5HRSA9IDEgPDwgMSwgDQogICAgICAgIE5PVElG
WV9ERVZJQ0VJRDRfREVMRVRFID0gMSA8PCAyLCANCn07IA0KDQo=
Marc Eshel wrote:
commit 1013e2ea88384da2e7326f40047bbc92deb9e516
Author: Marc Eshel <[email protected]>
Date: Fri Dec 7 15:58:07 2012 -0800
Change definition of notify_deviceid_type4 to correspond to the NFSv4.1
spec.
Doesn't apply for me:
% git am ~/Mail/tmp/89
Applying: RE: notify_deviceid_type4
fatal: corrupt patch at line 9
Patch failed at 0001 RE: notify_deviceid_type4
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".