diff for duplicates of <1427213523.221225.30.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index e38530a..64cec6b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,14 +1,28 @@ -T24gVHVlLCAyMDE1LTAzLTI0IGF0IDE2OjQyICswMTAwLCBNaWNoYWVsIFMuIFRzaXJraW4gd3Jv -dGU6DQo+IHBjaSBjb3JlIG5vdyBkaXNhYmxlcyBtc2kgb24gcHJvYmUgYXV0b21hdGljYWxseSwN -Cj4gZHJvcCB0aGlzIGZyb20gZGV2aWNlLXNwZWNpZmljIGNvZGUuDQo+IA0KPiBDYzogQmpvcm4g -SGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4NCj4gQ2M6IGxpbnV4LXBjaUB2Z2VyLmtlcm5l -bC5vcmcNCj4gU2lnbmVkLW9mZi1ieTogTWljaGFlbCBTLiBUc2lya2luIDxtc3RAcmVkaGF0LmNv -bT4NCg0KQWNrZWQtYnk6IERhdmUgSmlhbmcgPGRhdmUuamlhbmdAaW50ZWwuY29tPg0KDQo+IC0t -LQ0KPiAgZHJpdmVycy9udGIvbnRiX2h3LmMgfCAyIC0tDQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBk -ZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL250Yi9udGJfaHcuYyBiL2Ry -aXZlcnMvbnRiL250Yl9ody5jDQo+IGluZGV4IGNkMjliMTAuLjgyMjVjYmMgMTAwNjQ0DQo+IC0t -LSBhL2RyaXZlcnMvbnRiL250Yl9ody5jDQo+ICsrKyBiL2RyaXZlcnMvbnRiL250Yl9ody5jDQo+ -IEBAIC0xMzEzLDggKzEzMTMsNiBAQCBzdGF0aWMgaW50IG50Yl9zZXR1cF9pbnR4KHN0cnVjdCBu -dGJfZGV2aWNlICpuZGV2KQ0KPiAgCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gbmRldi0+cGRldjsN -Cj4gIAlpbnQgcmM7DQo+ICANCj4gLQlwY2lfbXNpX29mZihwZGV2KTsNCj4gLQ0KPiAgCS8qIFZl -cmlmeSBpbnR4IGlzIGVuYWJsZWQgKi8NCj4gIAlwY2lfaW50eChwZGV2LCAxKTsNCj4gIA0K +On Tue, 2015-03-24 at 16:42 +0100, Michael S. Tsirkin wrote: +> pci core now disables msi on probe automatically, +> drop this from device-specific code. +> +> Cc: Bjorn Helgaas <bhelgaas@google.com> +> Cc: linux-pci@vger.kernel.org +> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> + +Acked-by: Dave Jiang <dave.jiang@intel.com> + +> --- +> drivers/ntb/ntb_hw.c | 2 -- +> 1 file changed, 2 deletions(-) +> +> diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c +> index cd29b10..8225cbc 100644 +> --- a/drivers/ntb/ntb_hw.c +> +++ b/drivers/ntb/ntb_hw.c +> @@ -1313,8 +1313,6 @@ static int ntb_setup_intx(struct ntb_device *ndev) +> struct pci_dev *pdev = ndev->pdev; +> int rc; +> +> - pci_msi_off(pdev); +> - +> /* Verify intx is enabled */ +> pci_intx(pdev, 1); +> +ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥ diff --git a/a/content_digest b/N1/content_digest index a956677..a53ac7d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -13,19 +13,33 @@ " famz@redhat.com <famz@redhat.com>\0" "\00:1\0" "b\0" - "T24gVHVlLCAyMDE1LTAzLTI0IGF0IDE2OjQyICswMTAwLCBNaWNoYWVsIFMuIFRzaXJraW4gd3Jv\n" - "dGU6DQo+IHBjaSBjb3JlIG5vdyBkaXNhYmxlcyBtc2kgb24gcHJvYmUgYXV0b21hdGljYWxseSwN\n" - "Cj4gZHJvcCB0aGlzIGZyb20gZGV2aWNlLXNwZWNpZmljIGNvZGUuDQo+IA0KPiBDYzogQmpvcm4g\n" - "SGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4NCj4gQ2M6IGxpbnV4LXBjaUB2Z2VyLmtlcm5l\n" - "bC5vcmcNCj4gU2lnbmVkLW9mZi1ieTogTWljaGFlbCBTLiBUc2lya2luIDxtc3RAcmVkaGF0LmNv\n" - "bT4NCg0KQWNrZWQtYnk6IERhdmUgSmlhbmcgPGRhdmUuamlhbmdAaW50ZWwuY29tPg0KDQo+IC0t\n" - "LQ0KPiAgZHJpdmVycy9udGIvbnRiX2h3LmMgfCAyIC0tDQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBk\n" - "ZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL250Yi9udGJfaHcuYyBiL2Ry\n" - "aXZlcnMvbnRiL250Yl9ody5jDQo+IGluZGV4IGNkMjliMTAuLjgyMjVjYmMgMTAwNjQ0DQo+IC0t\n" - "LSBhL2RyaXZlcnMvbnRiL250Yl9ody5jDQo+ICsrKyBiL2RyaXZlcnMvbnRiL250Yl9ody5jDQo+\n" - "IEBAIC0xMzEzLDggKzEzMTMsNiBAQCBzdGF0aWMgaW50IG50Yl9zZXR1cF9pbnR4KHN0cnVjdCBu\n" - "dGJfZGV2aWNlICpuZGV2KQ0KPiAgCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gbmRldi0+cGRldjsN\n" - "Cj4gIAlpbnQgcmM7DQo+ICANCj4gLQlwY2lfbXNpX29mZihwZGV2KTsNCj4gLQ0KPiAgCS8qIFZl\n" - cmlmeSBpbnR4IGlzIGVuYWJsZWQgKi8NCj4gIAlwY2lfaW50eChwZGV2LCAxKTsNCj4gIA0K + "On Tue, 2015-03-24 at 16:42 +0100, Michael S. Tsirkin wrote:\n" + "> pci core now disables msi on probe automatically,\n" + "> drop this from device-specific code.\n" + "> \n" + "> Cc: Bjorn Helgaas <bhelgaas@google.com>\n" + "> Cc: linux-pci@vger.kernel.org\n" + "> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>\n" + "\n" + "Acked-by: Dave Jiang <dave.jiang@intel.com>\n" + "\n" + "> ---\n" + "> drivers/ntb/ntb_hw.c | 2 --\n" + "> 1 file changed, 2 deletions(-)\n" + "> \n" + "> diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c\n" + "> index cd29b10..8225cbc 100644\n" + "> --- a/drivers/ntb/ntb_hw.c\n" + "> +++ b/drivers/ntb/ntb_hw.c\n" + "> @@ -1313,8 +1313,6 @@ static int ntb_setup_intx(struct ntb_device *ndev)\n" + "> \tstruct pci_dev *pdev = ndev->pdev;\n" + "> \tint rc;\n" + "> \n" + "> -\tpci_msi_off(pdev);\n" + "> -\n" + "> \t/* Verify intx is enabled */\n" + "> \tpci_intx(pdev, 1);\n" + "> \n" + "\303\277\303\264\303\250\302\272{.n\303\207+\302\211\302\267\302\237\302\256\302\211\302\255\302\206+%\302\212\303\213\303\277\302\261\303\251\303\235\302\266\027\302\245\302\212w\303\277\302\272{.n\303\207+\302\211\302\267\302\245\302\212{\302\261\303\276G\302\253\302\235\303\251\303\277\302\212{ay\302\272\035\303\212\302\207\303\232\302\231\303\253,j\a\302\255\302\242f\302\243\302\242\302\267h\302\232\302\217\303\257\302\201\303\252\303\277\302\221\303\252\303\247z_\303\250\302\256\003(\302\255\303\251\302\232\302\216\302\212\303\235\302\242j\"\302\235\303\272\032\302\266\033m\302\247\303\277\303\277\302\276\a\302\253\303\276G\302\253\302\235\303\251\303\277\302\242\302\270?\302\231\302\250\303\250\302\255\303\232&\302\243\303\270\302\247~\302\217\303\241\302\266iO\302\225\303\246\302\254z\302\267\302\232v\303\230^\024\004\032\302\266\033m\302\247\303\277\303\277\303\203\f\303\277\302\266\303\254\303\277\302\242\302\270?\302\226I\302\245" -938def564b318778b79764fe0ddc1b6defd413df38c942ba4e4c247c2201f743 +23e3d916aaee8b8f309917da75926b23a00a757f0741eccf2a600481f758d0d5
diff --git a/a/1.txt b/N2/1.txt index e38530a..a8ee5f4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,14 +1,27 @@ -T24gVHVlLCAyMDE1LTAzLTI0IGF0IDE2OjQyICswMTAwLCBNaWNoYWVsIFMuIFRzaXJraW4gd3Jv -dGU6DQo+IHBjaSBjb3JlIG5vdyBkaXNhYmxlcyBtc2kgb24gcHJvYmUgYXV0b21hdGljYWxseSwN -Cj4gZHJvcCB0aGlzIGZyb20gZGV2aWNlLXNwZWNpZmljIGNvZGUuDQo+IA0KPiBDYzogQmpvcm4g -SGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4NCj4gQ2M6IGxpbnV4LXBjaUB2Z2VyLmtlcm5l -bC5vcmcNCj4gU2lnbmVkLW9mZi1ieTogTWljaGFlbCBTLiBUc2lya2luIDxtc3RAcmVkaGF0LmNv -bT4NCg0KQWNrZWQtYnk6IERhdmUgSmlhbmcgPGRhdmUuamlhbmdAaW50ZWwuY29tPg0KDQo+IC0t -LQ0KPiAgZHJpdmVycy9udGIvbnRiX2h3LmMgfCAyIC0tDQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBk -ZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL250Yi9udGJfaHcuYyBiL2Ry -aXZlcnMvbnRiL250Yl9ody5jDQo+IGluZGV4IGNkMjliMTAuLjgyMjVjYmMgMTAwNjQ0DQo+IC0t -LSBhL2RyaXZlcnMvbnRiL250Yl9ody5jDQo+ICsrKyBiL2RyaXZlcnMvbnRiL250Yl9ody5jDQo+ -IEBAIC0xMzEzLDggKzEzMTMsNiBAQCBzdGF0aWMgaW50IG50Yl9zZXR1cF9pbnR4KHN0cnVjdCBu -dGJfZGV2aWNlICpuZGV2KQ0KPiAgCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gbmRldi0+cGRldjsN -Cj4gIAlpbnQgcmM7DQo+ICANCj4gLQlwY2lfbXNpX29mZihwZGV2KTsNCj4gLQ0KPiAgCS8qIFZl -cmlmeSBpbnR4IGlzIGVuYWJsZWQgKi8NCj4gIAlwY2lfaW50eChwZGV2LCAxKTsNCj4gIA0K +On Tue, 2015-03-24 at 16:42 +0100, Michael S. Tsirkin wrote: +> pci core now disables msi on probe automatically, +> drop this from device-specific code. +> +> Cc: Bjorn Helgaas <bhelgaas@google.com> +> Cc: linux-pci@vger.kernel.org +> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> + +Acked-by: Dave Jiang <dave.jiang@intel.com> + +> --- +> drivers/ntb/ntb_hw.c | 2 -- +> 1 file changed, 2 deletions(-) +> +> diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c +> index cd29b10..8225cbc 100644 +> --- a/drivers/ntb/ntb_hw.c +> +++ b/drivers/ntb/ntb_hw.c +> @@ -1313,8 +1313,6 @@ static int ntb_setup_intx(struct ntb_device *ndev) +> struct pci_dev *pdev = ndev->pdev; +> int rc; +> +> - pci_msi_off(pdev); +> - +> /* Verify intx is enabled */ +> pci_intx(pdev, 1); +> diff --git a/a/content_digest b/N2/content_digest index a956677..1a185d5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -13,19 +13,32 @@ " famz@redhat.com <famz@redhat.com>\0" "\00:1\0" "b\0" - "T24gVHVlLCAyMDE1LTAzLTI0IGF0IDE2OjQyICswMTAwLCBNaWNoYWVsIFMuIFRzaXJraW4gd3Jv\n" - "dGU6DQo+IHBjaSBjb3JlIG5vdyBkaXNhYmxlcyBtc2kgb24gcHJvYmUgYXV0b21hdGljYWxseSwN\n" - "Cj4gZHJvcCB0aGlzIGZyb20gZGV2aWNlLXNwZWNpZmljIGNvZGUuDQo+IA0KPiBDYzogQmpvcm4g\n" - "SGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4NCj4gQ2M6IGxpbnV4LXBjaUB2Z2VyLmtlcm5l\n" - "bC5vcmcNCj4gU2lnbmVkLW9mZi1ieTogTWljaGFlbCBTLiBUc2lya2luIDxtc3RAcmVkaGF0LmNv\n" - "bT4NCg0KQWNrZWQtYnk6IERhdmUgSmlhbmcgPGRhdmUuamlhbmdAaW50ZWwuY29tPg0KDQo+IC0t\n" - "LQ0KPiAgZHJpdmVycy9udGIvbnRiX2h3LmMgfCAyIC0tDQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBk\n" - "ZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL250Yi9udGJfaHcuYyBiL2Ry\n" - "aXZlcnMvbnRiL250Yl9ody5jDQo+IGluZGV4IGNkMjliMTAuLjgyMjVjYmMgMTAwNjQ0DQo+IC0t\n" - "LSBhL2RyaXZlcnMvbnRiL250Yl9ody5jDQo+ICsrKyBiL2RyaXZlcnMvbnRiL250Yl9ody5jDQo+\n" - "IEBAIC0xMzEzLDggKzEzMTMsNiBAQCBzdGF0aWMgaW50IG50Yl9zZXR1cF9pbnR4KHN0cnVjdCBu\n" - "dGJfZGV2aWNlICpuZGV2KQ0KPiAgCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gbmRldi0+cGRldjsN\n" - "Cj4gIAlpbnQgcmM7DQo+ICANCj4gLQlwY2lfbXNpX29mZihwZGV2KTsNCj4gLQ0KPiAgCS8qIFZl\n" - cmlmeSBpbnR4IGlzIGVuYWJsZWQgKi8NCj4gIAlwY2lfaW50eChwZGV2LCAxKTsNCj4gIA0K + "On Tue, 2015-03-24 at 16:42 +0100, Michael S. Tsirkin wrote:\n" + "> pci core now disables msi on probe automatically,\n" + "> drop this from device-specific code.\n" + "> \n" + "> Cc: Bjorn Helgaas <bhelgaas@google.com>\n" + "> Cc: linux-pci@vger.kernel.org\n" + "> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>\n" + "\n" + "Acked-by: Dave Jiang <dave.jiang@intel.com>\n" + "\n" + "> ---\n" + "> drivers/ntb/ntb_hw.c | 2 --\n" + "> 1 file changed, 2 deletions(-)\n" + "> \n" + "> diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c\n" + "> index cd29b10..8225cbc 100644\n" + "> --- a/drivers/ntb/ntb_hw.c\n" + "> +++ b/drivers/ntb/ntb_hw.c\n" + "> @@ -1313,8 +1313,6 @@ static int ntb_setup_intx(struct ntb_device *ndev)\n" + "> \tstruct pci_dev *pdev = ndev->pdev;\n" + "> \tint rc;\n" + "> \n" + "> -\tpci_msi_off(pdev);\n" + "> -\n" + "> \t/* Verify intx is enabled */\n" + "> \tpci_intx(pdev, 1);\n" + > -938def564b318778b79764fe0ddc1b6defd413df38c942ba4e4c247c2201f743 +b161421f544099e2df8227d172ce132045c4899c32b9a5bd507c595432ad727b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.