diff for duplicates of <20140527171915.GA14005@google.com> diff --git a/a/1.txt b/N1/1.txt index 5b3a643..4409c2d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,9 +1,9 @@ -On Fri, May 02, 2014@10:40:42AM -0600, Keith Busch wrote: +On Fri, May 02, 2014 at 10:40:42AM -0600, Keith Busch wrote: > Notifies a pci device driver when its device's access is about to be > disabled for an impending reset attempt, then after the attempt completes > and device access is restored. > -> Signed-off-by: Keith Busch <keith.busch at intel.com> +> Signed-off-by: Keith Busch <keith.busch@intel.com> I applied both of these to my pci/hotplug branch for v3.16. Let me know if you want me to drop the NVMe patch and have it go via another tree. diff --git a/a/content_digest b/N1/content_digest index 925f233..44e01f7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,20 @@ "ref\01399048843-9376-1-git-send-email-keith.busch@intel.com\0" - "From\0bhelgaas@google.com (Bjorn Helgaas)\0" - "Subject\0[PATCHv2 1/2] PCI: Device driver reset notification\0" + "From\0Bjorn Helgaas <bhelgaas@google.com>\0" + "Subject\0Re: [PATCHv2 1/2] PCI: Device driver reset notification\0" "Date\0Tue, 27 May 2014 11:19:15 -0600\0" + "To\0Keith Busch <keith.busch@intel.com>\0" + "Cc\0linux-nvme@lists.infradead.org" + linux-pci@vger.kernel.org + Matthew Wilcox <willy@linux.intel.com> + " Matthew Wilcox <matthew.r.wilcox@intel.com>\0" "\00:1\0" "b\0" - "On Fri, May 02, 2014@10:40:42AM -0600, Keith Busch wrote:\n" + "On Fri, May 02, 2014 at 10:40:42AM -0600, Keith Busch wrote:\n" "> Notifies a pci device driver when its device's access is about to be\n" "> disabled for an impending reset attempt, then after the attempt completes\n" "> and device access is restored.\n" "> \n" - "> Signed-off-by: Keith Busch <keith.busch at intel.com>\n" + "> Signed-off-by: Keith Busch <keith.busch@intel.com>\n" "\n" "I applied both of these to my pci/hotplug branch for v3.16. Let me know if\n" "you want me to drop the NVMe patch and have it go via another tree.\n" @@ -92,4 +97,4 @@ "> 1.7.10.4\n" > -a5189c2fa20b1bb3709d68b012c668419cccaa588b025d20d735ba5cf709b83b +1e9f37537b215401247494e065eb5383d2d59c524d5e8dcc207fbc79df673849
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.