diff for duplicates of <20180305192134.32207-3-decui@microsoft.com> diff --git a/a/1.txt b/N1/1.txt index ccf292f..e2f8088 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,18 +16,21 @@ diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index 1233300f41c6..04edb24c92ee 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c -@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct = -*work) -=20 - hpdev =3D container_of(work, struct hv_pci_dev, wrk); -=20 -- if (hpdev->state !=3D hv_pcichild_ejecting) { +@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct *work) + + hpdev = container_of(work, struct hv_pci_dev, wrk); + +- if (hpdev->state != hv_pcichild_ejecting) { - put_pcichild(hpdev, hv_pcidev_ref_pnp); - return; - } -+ WARN_ON(hpdev->state !=3D hv_pcichild_ejecting); -=20 ++ WARN_ON(hpdev->state != hv_pcichild_ejecting); + /* * Ejection can come before or after the PCI bus has been set up, so ---=20 +-- 2.7.4 +_______________________________________________ +devel mailing list +devel@linuxdriverproject.org +http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel diff --git a/a/content_digest b/N1/content_digest index fabc8f6..79179c7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,15 +9,14 @@ olaf@aepfle.de <olaf@aepfle.de> apw@canonical.com <apw@canonical.com> " jasowang@redhat.com <jasowang@redhat.com>\0" - "Cc\0linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>" + "Cc\0Haiyang Zhang <haiyangz@microsoft.com>" driverdev-devel@linuxdriverproject.org <driverdev-devel@linuxdriverproject.org> - Haiyang Zhang <haiyangz@microsoft.com> - vkuznets@redhat.com <vkuznets@redhat.com> - marcelo.cerri@canonical.com <marcelo.cerri@canonical.com> - Michael Kelley (EOSG) <Michael.H.Kelley@microsoft.com> - Dexuan Cui <decui@microsoft.com> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + stable@vger.kernel.org <stable@vger.kernel.org> Jack Morgenstein <jackm@mellanox.com> - " stable@vger.kernel.org <stable@vger.kernel.org>\0" + " Michael Kelley \\(EOSG\\) <Michael.H.Kelley@microsoft.com>" + marcelo.cerri@canonical.com <marcelo.cerri@canonical.com> + " vkuznets@redhat.com <vkuznets@redhat.com>\0" "\00:1\0" "b\0" "When we're in the function, hpdev->state must be hv_pcichild_ejecting:\n" @@ -38,20 +37,23 @@ "index 1233300f41c6..04edb24c92ee 100644\n" "--- a/drivers/pci/host/pci-hyperv.c\n" "+++ b/drivers/pci/host/pci-hyperv.c\n" - "@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct =\n" - "*work)\n" - "=20\n" - " \thpdev =3D container_of(work, struct hv_pci_dev, wrk);\n" - "=20\n" - "-\tif (hpdev->state !=3D hv_pcichild_ejecting) {\n" + "@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct *work)\n" + " \n" + " \thpdev = container_of(work, struct hv_pci_dev, wrk);\n" + " \n" + "-\tif (hpdev->state != hv_pcichild_ejecting) {\n" "-\t\tput_pcichild(hpdev, hv_pcidev_ref_pnp);\n" "-\t\treturn;\n" "-\t}\n" - "+\tWARN_ON(hpdev->state !=3D hv_pcichild_ejecting);\n" - "=20\n" + "+\tWARN_ON(hpdev->state != hv_pcichild_ejecting);\n" + " \n" " \t/*\n" " \t * Ejection can come before or after the PCI bus has been set up, so\n" - "--=20\n" - 2.7.4 + "-- \n" + "2.7.4\n" + "_______________________________________________\n" + "devel mailing list\n" + "devel@linuxdriverproject.org\n" + http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel -231d3146743e1b8fb3614dba7e5ca39adca5482965de668ef5ff342d4484a4e0 +1a0dc9b53b4416fa50edd1e38583d35b1fd546ad000eb6e2396f73a0f5be953d
diff --git a/a/1.txt b/N2/1.txt index ccf292f..c1d2e13 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,18 +16,17 @@ diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index 1233300f41c6..04edb24c92ee 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c -@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct = -*work) -=20 - hpdev =3D container_of(work, struct hv_pci_dev, wrk); -=20 -- if (hpdev->state !=3D hv_pcichild_ejecting) { +@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct *work) + + hpdev = container_of(work, struct hv_pci_dev, wrk); + +- if (hpdev->state != hv_pcichild_ejecting) { - put_pcichild(hpdev, hv_pcidev_ref_pnp); - return; - } -+ WARN_ON(hpdev->state !=3D hv_pcichild_ejecting); -=20 ++ WARN_ON(hpdev->state != hv_pcichild_ejecting); + /* * Ejection can come before or after the PCI bus has been set up, so ---=20 +-- 2.7.4 diff --git a/a/content_digest b/N2/content_digest index fabc8f6..88d6ea6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -38,20 +38,19 @@ "index 1233300f41c6..04edb24c92ee 100644\n" "--- a/drivers/pci/host/pci-hyperv.c\n" "+++ b/drivers/pci/host/pci-hyperv.c\n" - "@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct =\n" - "*work)\n" - "=20\n" - " \thpdev =3D container_of(work, struct hv_pci_dev, wrk);\n" - "=20\n" - "-\tif (hpdev->state !=3D hv_pcichild_ejecting) {\n" + "@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct *work)\n" + " \n" + " \thpdev = container_of(work, struct hv_pci_dev, wrk);\n" + " \n" + "-\tif (hpdev->state != hv_pcichild_ejecting) {\n" "-\t\tput_pcichild(hpdev, hv_pcidev_ref_pnp);\n" "-\t\treturn;\n" "-\t}\n" - "+\tWARN_ON(hpdev->state !=3D hv_pcichild_ejecting);\n" - "=20\n" + "+\tWARN_ON(hpdev->state != hv_pcichild_ejecting);\n" + " \n" " \t/*\n" " \t * Ejection can come before or after the PCI bus has been set up, so\n" - "--=20\n" + "-- \n" 2.7.4 -231d3146743e1b8fb3614dba7e5ca39adca5482965de668ef5ff342d4484a4e0 +11f95a1c0670f23ba8b9847ef8afe34c955d7b9833eed10778890d645aa8db71
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.