diff for duplicates of <20180315184055.3102.2435.stgit@localhost.localdomain>
diff --git a/a/1.txt b/N1/1.txt
index 77a4b19..4676ecd 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ This patch adds a common configuration function called
pci_sriov_configure_simple that will allow for managing VFs on devices
where the PF is not capable of managing VF resources.
-Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
+Signed-off-by: Alexander Duyck <alexander.h.duyck at intel.com>
---
v5: New patch replacing pci_sriov_configure_unmanaged with
diff --git a/a/content_digest b/N1/content_digest
index 69b0ff1..73be7cd 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\00020180315183449.3102.64791.stgit\@localhost.localdomain\0"
]
[
- "From\0Alexander Duyck <alexander.duyck\@gmail.com>\0"
+ "From\0alexander.duyck\@gmail.com (Alexander Duyck)\0"
]
[
"Subject\0[pci PATCH v7 1/5] pci: Add pci_sriov_configure_simple for PFs that don't manage VF resources\0"
@@ -10,28 +10,6 @@
[
"Date\0Thu, 15 Mar 2018 11:41:25 -0700\0"
]
-[
- "To\0bhelgaas\@google.com",
- " alexander.h.duyck\@intel.com",
- " linux-pci\@vger.kernel.org\0"
-]
-[
- "Cc\0virtio-dev\@lists.oasis-open.org",
- " kvm\@vger.kernel.org",
- " netdev\@vger.kernel.org",
- " dan.daly\@intel.com",
- " linux-kernel\@vger.kernel.org",
- " linux-nvme\@lists.infradead.org",
- " keith.busch\@intel.com",
- " netanel\@amazon.com",
- " ddutile\@redhat.com",
- " mheyne\@amazon.de",
- " liang-min.wang\@intel.com",
- " mark.d.rustad\@intel.com",
- " dwmw2\@infradead.org",
- " hch\@lst.de",
- " dwmw\@amazon.co.uk\0"
-]
[
"\0000:1\0"
]
@@ -45,7 +23,7 @@
"pci_sriov_configure_simple that will allow for managing VFs on devices\n",
"where the PF is not capable of managing VF resources.\n",
"\n",
- "Signed-off-by: Alexander Duyck <alexander.h.duyck\@intel.com>\n",
+ "Signed-off-by: Alexander Duyck <alexander.h.duyck at intel.com>\n",
"---\n",
"\n",
"v5: New patch replacing pci_sriov_configure_unmanaged with\n",
@@ -121,4 +99,4 @@
" static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { }"
]
-90102d0ff0cdad4f4bf17eb4fd667188cdafd628047f966fccce672ca7d1b7a7
+3208d1fbad6d0a9e3bd85ab1e07376f8bd758fa5eaf4c7e63786f74eec719071
diff --git a/a/1.txt b/N2/1.txt
index 77a4b19..f066e23 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -77,4 +77,9 @@ index 024a1beda008..992202449829 100644
+#define pci_sriov_configure_simple NULL
static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno)
{ return 0; }
- static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { }
\ No newline at end of file
+ static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { }
+
+
+---------------------------------------------------------------------
+To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org
+For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 69b0ff1..6ed69b4 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,7 +5,7 @@
"From\0Alexander Duyck <alexander.duyck\@gmail.com>\0"
]
[
- "Subject\0[pci PATCH v7 1/5] pci: Add pci_sriov_configure_simple for PFs that don't manage VF resources\0"
+ "Subject\0[virtio-dev] [pci PATCH v7 1/5] pci: Add pci_sriov_configure_simple for PFs that don't manage VF resources\0"
]
[
"Date\0Thu, 15 Mar 2018 11:41:25 -0700\0"
@@ -118,7 +118,12 @@
"+#define pci_sriov_configure_simple NULL\n",
" static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno)\n",
" { return 0; }\n",
- " static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { }"
+ " static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { }\n",
+ "\n",
+ "\n",
+ "---------------------------------------------------------------------\n",
+ "To unsubscribe, e-mail: virtio-dev-unsubscribe\@lists.oasis-open.org\n",
+ "For additional commands, e-mail: virtio-dev-help\@lists.oasis-open.org"
]
-90102d0ff0cdad4f4bf17eb4fd667188cdafd628047f966fccce672ca7d1b7a7
+a9d2568c6fa7809da913c413553b83f3bb5a4560905bb5cc69d576b661d5ef55
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.