From mboxrd@z Thu Jan 1 00:00:00 1970 From: Saeed Mahameed Subject: Re: linux-next: manual merge of the net-next tree with the rdma-fixes tree Date: Fri, 16 Mar 2018 06:54:08 +0000 Message-ID: <1521183244.19648.27.camel@mellanox.com> References: <20180316115610.3d7f232a@canb.auug.org.au> <1521163082.18703.191.camel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1521163082.18703.191.camel@redhat.com> Content-Language: en-US Content-ID: <074BBDE3EFF2A8468A576D311AF8B046@eurprd05.prod.outlook.com> Sender: linux-kernel-owner@vger.kernel.org To: "sfr@canb.auug.org.au" , "davem@davemloft.net" , "netdev@vger.kernel.org" , Jason Gunthorpe , "dledford@redhat.com" Cc: "linux-kernel@vger.kernel.org" , Leon Romanovsky , "linux-next@vger.kernel.org" , Mark Bloch List-Id: linux-next.vger.kernel.org T24gVGh1LCAyMDE4LTAzLTE1IGF0IDIxOjE4IC0wNDAwLCBEb3VnIExlZGZvcmQgd3JvdGU6DQo+ IE9uIEZyaSwgMjAxOC0wMy0xNiBhdCAxMTo1NiArMTEwMCwgU3RlcGhlbiBSb3Rod2VsbCB3cm90 ZToNCj4gPiBIaSBhbGwsDQo+ID4gDQo+ID4gVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRo ZSBuZXQtbmV4dCB0cmVlIGdvdCBhIGNvbmZsaWN0IGluOg0KPiA+IA0KPiA+ICAgZHJpdmVycy9p bmZpbmliYW5kL2h3L21seDUvbWFpbi5jDQo+ID4gDQo+ID4gYmV0d2VlbiBjb21taXQ6DQo+ID4g DQo+ID4gICA0MmNlYTgzZjk1MjQgKCJJQi9tbHg1OiBGaXggY2xlYW51cCBvcmRlciBvbiB1bmxv YWQiKQ0KPiA+IA0KPiA+IGZyb20gdGhlIHJkbWEtZml4ZXMgdHJlZSBhbmQgY29tbWl0Og0KPiA+ IA0KPiA+ICAgYjVjYTE1YWQ3ZTYxICgiSUIvbWx4NTogQWRkIHByb3BlciByZXByZXNlbnRvcnMg c3VwcG9ydCIpDQo+ID4gDQo+ID4gZnJvbSB0aGUgbmV0LW5leHQgdHJlZS4NCj4gDQo+IFdlIGFy ZSBhd2FyZSBvZiB0aGUgbWVyZ2UgY29uZmxpY3QuICBUaGlzIGlzIGEgcmVzdWx0IG9mIHRoZSBm YWN0DQo+IHRoYXQNCj4gY29kZSBoYWQgYmVlbiBzdWJtaXR0ZWQgdG8gdGhlIGZvci1uZXh0IGFy ZWEgKHRoZSByZXByZXNlbnRvcnMNCj4gc3VwcG9ydCkNCj4gYW5kIGFmdGVyIHRoYXQgYW4gaXNz dWUgd2FzIGZvdW5kIGJ5IHRoZSBzeXprYWxsZXIgYm90IHRoYXQgZGVzZXJ2ZWQNCj4gcmMNCj4g Zml4IHN0YXR1cyBhbmQgd2hpY2ggY29uZmxpY3RlZC4gIFRoZSBmaXh1cCB5b3UgbGlzdCBiZWxv dyBpcw0KPiBpbnN1ZmZpY2llbnQgdG8gZml4IHRoZSBtZXJnZSBjb25mbGljdC4gIFRoZSBmdWxs IGZpeHVwIGNhbiBiZSBmb3VuZA0KPiBpbg0KPiB0aGUgcmRtYSB0cmVlIGZyb20gd2hlcmUgSSBt ZXJnZWQgdGhlIGZvci1yYyBicmFuY2ggaW50byB0aGUgZm9yLW5leHQNCj4gYnJhbmNoIGFuZCBj cmVhdGVkIGEgY29tcGxldGUgZml4dXAgb2YgdGhlIG1lcmdlIGNvbmZsaWN0LiAgVGhlDQo+IHBy b2JsZW0NCj4gaXMgdGhhdCBvbmUgcGF0Y2ggY2hhbmdlIHRoZSBkZXZpY2UgaW5pdCBzdGFnZSBm bG93LCB3aGlsZSB0aGUgb3RoZXINCj4gcGF0Y2ggZHVwbGljYXRlcyB0aGUgbm9ybWFsIGRldmlj ZSBpbml0IHN0YWdlIGZsb3cgdG8gdGhlIHJlcHJlc2VudG9yDQo+IGRldmljZSBzdGFnZSBmbG93 LiAgVG8gcmVzb2x2ZSB0aGUgZml4LCB5b3Ugbm90IG9ubHkgaGF2ZSB0byByZXNvbHZlDQo+IHRo ZQ0KPiBjb250ZXh0dWFsIGRpZmZzLCBidXQgeW91IGhhdmUgdG8gZHVwbGljYXRlIHRoZSBjaGFu Z2VzIHRvIHRoZSBub3JtYWwNCj4gZGV2aWNlIHN0YWdlIGZsb3cgaW50byB0aGUgcmVwcmVzZW50 b3IgZGV2aWNlIHN0YWdlIGZsb3cuICBJdCBpcyB2ZXJ5DQo+IGZhciBmcm9tIGEgdHJpdmlhbCBt ZXJnZS4gIFdlIHdlcmUgcGxhbm5pbmcgb24gdGFsa2luZyB0byBEYXZlIGFib3V0DQo+IHRoaXMg aXNzdWUgdG9tb3Jyb3csIGJ1dCB5b3UgYmVhdCB1cyB0byByYWlzaW5nIHRoZSBpc3N1ZSA7LSku DQo+IA0KPiBIZXJlJ3MgdGhlIGNvbW1pdCAoZnJvbSB0aGUgcmRtYSBnaXQgcmVwbykgd2l0aCB0 aGUgcHJvcGVyIG1lcmdlIGZpeA0KPiAoYWx0aG91Z2ggaXQgYWxzbyBoYXMgb3RoZXIgbWlub3Ig bWVyZ2Ugc3R1ZmYgdGhhdCBuZWVkcyB0byBiZQ0KPiBpZ25vcmVkKToNCj4gDQo+IDJkODczNDQ5 YTIwMiAoTWVyZ2UgYnJhbmNoICdrLm8vd2lwL2RsLWZvci1yYycgaW50byBrLm8vd2lwL2RsLWZv ci0NCj4gbmV4dCkNCj4gDQoNCkRhdmUsIFdpbGwgeW91IGJlIGFibGUgdG8gdGFrZSBjYXJlIG9m IHRoaXM/IHlvdSB3aWxsIHNlZSB0aGlzIG9uY2UgdGhlDQpyZG1hIGZpeCBnZXRzIHN1Ym1pdHRl ZCB0byBsaW51cyBhbmQgeW91IGJhY2sgbWVyZ2UgcmMgaW50byBuZXQtbmV4dC4NCmFmdGVyIHRo YXQgd2UgbmVlZCB0byB2ZXJpZnkgdGhhdCBuZXQtbmV4dCBtZXJnZXMgY2xlYW5seSB3aXRoIHJk bWEtDQpuZXh0IChmcm9tIG1seDUgcG9pbnQgb2YgdmlldykgdG8gbWFrZSBzdXJlIHdlIHdvbid0 IHJ1biBpbnRvIHRyb3VibGUNCmluIHRoZSBuZXh0IG1lcmdlIHdpbmRvdy4NCg0KSSB3b3VsZCBs aWtlIGFsc28gdG8gYXZvaWQgc3VjaCBjb25mbGljdHMgaW4gdGhlIGZ1dHVyZSwgc2luY2Ugbm93 DQpyZG1hLXJjIGlzIGFjdGl2ZSB3ZSBhcmUgbW9yZSBsaWtlbHkgdG8gcnVuIGludG8gc3VjaCBp c3N1ZXMsIHRvIHNvbHZlDQp0aGlzIG1heWJlIHRoZSByaWdodCB3YXkgdG8gZ28gaXMgdG8gYXZv aWQgdG91Y2hpbmcgcmRtYS9uZXRkZXYgZnJvbQ0KbWx4NSBzaGFyZWQgY29kZSBwdWxsIHJlcXVl c3RzIGFuZCBrZWVwIG1seDUgY29yZSBzdHVmZiBjbGVhbiwgdGhlIGlkZWENCmlzIHRvIHJ1biBh IHB1cmUgbWx4NSBjb3JlIGluY3JlbWVudGFsIGJyYW5jaCBpbiBwYXJhbGxlbCB0byBuZXRkZXYg YW5kDQpyZG1hLCB0aGlzIGJyYW5jaCB3aWxsIGluY2x1ZGUgYWxsIHB1cmUgdXBkYXRlcyB0byBt bHg1IGNvcmUsIG1seDUNCm5ldGRldiBvciByZG1hIHBhdGNoZXMgd2lsbCBiZSBzZW50IHRvIG5l dGRldiBhbmQgcmRtYSBicmFuY2hlcw0Kc2VwYXJhdGVseSB0aGV5IGNhbiBiZSBiYXNlZCBvbiBs YXRlc3QgbWx4NSBjb3JlIGJyYW5jaCBvciBub3QuDQoNClRoaXMgd2F5IHlvdSBkb24ndCBuZWVk IHRvIHB1bGwgaW4gcmRtYSBzdHVmZiBmcm9tIHNoYXJlZCBjb2RlIGFuZA0KRG91Zy9KYXNvbiB3 b24ndCBuZWVkIHRvIHB1bGwgaW4gbmV0ZGV2IHN0dWZmLiBpdCBpcyBtb3JlIHdvcmsgZm9yIG1l LA0KYnV0IGZvciB5b3UgYW5kIHJkbWEsIHlvdSB3aWxsIHNlZSBvbmx5IGNsZWFuIG1seDUgY29y ZSBzdHVmZiBmcm9tDQpzaGFyZWQgY29kZSwgdGhlIHN0YWNrIHBhcnQgKG5ldGRldiBvciByZG1h KSB3aWxsIGdvIG9ubHkgdG8gdGhlDQpzcGVjaWZpYyBtYWludGFpbmVyIHJlc3BlY3RpdmVseS4N Cg0KV2hhdCBkbyB5b3UgdGhpbmsgPyBJIGNhbiBkbyBhIHNhbXBsZSBydW4gaW4gb25lIG9mIG15 IG5leHQgcHVsbA0KcmVxdWVzdHMgYW5kIHNlZSBob3cgaXQgZ29lcy4NCg0KVGhhbmtzLA0KU2Fl ZWQuDQo=