diff for duplicates of <20151017051847.GA13372@mwanda> diff --git a/a/1.txt b/N1/1.txt index 225ee46..c5b4f0c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ There is an extra semi-colon on this if statement so we always break on the first iteration. Fixes: 0204a4960982 ('iommu/vt-d: Add callback to device driver on page faults') -Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c index 99a7803..dd070e6 100644 @@ -12,8 +12,8 @@ index 99a7803..dd070e6 100644 /* Accounting for major/minor faults? */ rcu_read_lock(); list_for_each_entry_rcu(sdev, &svm->devs, list) { -- if (sdev->sid = PCI_DEVID(req->bus, req->devfn)); -+ if (sdev->sid = PCI_DEVID(req->bus, req->devfn)) +- if (sdev->sid == PCI_DEVID(req->bus, req->devfn)); ++ if (sdev->sid == PCI_DEVID(req->bus, req->devfn)) break; } /* Other devices can go away, but the drivers are not permitted diff --git a/a/content_digest b/N1/content_digest index e4bee03..35261dc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" + "From\0Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\0" "Subject\0[patch] iommu/vt-d: fix a loop in prq_event_thread()\0" - "Date\0Sat, 17 Oct 2015 05:18:47 +0000\0" + "Date\0Sat, 17 Oct 2015 08:18:47 +0300\0" "To\0Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>" " David Woodhouse <David.Woodhouse-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\0" "Cc\0iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org" @@ -12,7 +12,7 @@ "the first iteration.\n" "\n" "Fixes: 0204a4960982 ('iommu/vt-d: Add callback to device driver on page faults')\n" - "Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" + "Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\n" "\n" "diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c\n" "index 99a7803..dd070e6 100644\n" @@ -22,10 +22,10 @@ " \t\t/* Accounting for major/minor faults? */\n" " \t\trcu_read_lock();\n" " \t\tlist_for_each_entry_rcu(sdev, &svm->devs, list) {\n" - "-\t\t\tif (sdev->sid = PCI_DEVID(req->bus, req->devfn));\n" - "+\t\t\tif (sdev->sid = PCI_DEVID(req->bus, req->devfn))\n" + "-\t\t\tif (sdev->sid == PCI_DEVID(req->bus, req->devfn));\n" + "+\t\t\tif (sdev->sid == PCI_DEVID(req->bus, req->devfn))\n" " \t\t\t\tbreak;\n" " \t\t}\n" " \t\t/* Other devices can go away, but the drivers are not permitted" -69c64a23d6b12afd4297bcc3273f201707762b3598ff46146e4fd43efd021a4e +81b73301051e7a3c5414c0ac3434a9b634b6b91c85ace9b5bd2e1f8a7c9d6917
diff --git a/a/1.txt b/N2/1.txt index 225ee46..6241903 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,8 +12,8 @@ index 99a7803..dd070e6 100644 /* Accounting for major/minor faults? */ rcu_read_lock(); list_for_each_entry_rcu(sdev, &svm->devs, list) { -- if (sdev->sid = PCI_DEVID(req->bus, req->devfn)); -+ if (sdev->sid = PCI_DEVID(req->bus, req->devfn)) +- if (sdev->sid == PCI_DEVID(req->bus, req->devfn)); ++ if (sdev->sid == PCI_DEVID(req->bus, req->devfn)) break; } /* Other devices can go away, but the drivers are not permitted diff --git a/a/content_digest b/N2/content_digest index e4bee03..bb8dfea 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,11 +1,11 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] iommu/vt-d: fix a loop in prq_event_thread()\0" - "Date\0Sat, 17 Oct 2015 05:18:47 +0000\0" - "To\0Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>" - " David Woodhouse <David.Woodhouse-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\0" - "Cc\0iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org" - kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Date\0Sat, 17 Oct 2015 08:18:47 +0300\0" + "To\0Joerg Roedel <joro@8bytes.org>" + " David Woodhouse <David.Woodhouse@intel.com>\0" + "Cc\0iommu@lists.linux-foundation.org" + linux-kernel@vger.kernel.org + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" "There is an extra semi-colon on this if statement so we always break on\n" @@ -22,10 +22,10 @@ " \t\t/* Accounting for major/minor faults? */\n" " \t\trcu_read_lock();\n" " \t\tlist_for_each_entry_rcu(sdev, &svm->devs, list) {\n" - "-\t\t\tif (sdev->sid = PCI_DEVID(req->bus, req->devfn));\n" - "+\t\t\tif (sdev->sid = PCI_DEVID(req->bus, req->devfn))\n" + "-\t\t\tif (sdev->sid == PCI_DEVID(req->bus, req->devfn));\n" + "+\t\t\tif (sdev->sid == PCI_DEVID(req->bus, req->devfn))\n" " \t\t\t\tbreak;\n" " \t\t}\n" " \t\t/* Other devices can go away, but the drivers are not permitted" -69c64a23d6b12afd4297bcc3273f201707762b3598ff46146e4fd43efd021a4e +af0f38ce0c84624c588eeeea519d1ae373375e87ff47372406d5e1ef629ffc44
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.