diff for duplicates of <151076897413140@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 640e1f1..e99757b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,3 +1,4 @@ + This is a note to let you know that I've just added the patch titled EDAC, sb_edac: Don't create a second memory controller if HA1 is not present @@ -13,7 +14,7 @@ If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. -From 15cc3ae001873845b5d842e212478a6570c7d938 Mon Sep 17 00:00:00 2001 +>From 15cc3ae001873845b5d842e212478a6570c7d938 Mon Sep 17 00:00:00 2001 From: Qiuxu Zhuo <qiuxu.zhuo@intel.com> Date: Wed, 13 Sep 2017 18:42:14 +0800 Subject: EDAC, sb_edac: Don't create a second memory controller if HA1 is not present @@ -72,20 +73,11 @@ Link: http://lkml.kernel.org/r/20170913104214.7325-1-qiuxu.zhuo@intel.com [ Massage commit message. ] Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + --- drivers/edac/sb_edac.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) - - -Patches currently in stable-queue which might be from qiuxu.zhuo@intel.com are - -queue-4.14/edac-sb_edac-don-t-create-a-second-memory-controller-if-ha1-is-not-present.patch --- -To unsubscribe from this list: send the line "unsubscribe linux-edac" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -462,6 +462,7 @@ static const struct pci_id_table pci_dev @@ -118,3 +110,8 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html if (dev_descr->dom == SOCK) goto out_imc; + + +Patches currently in stable-queue which might be from qiuxu.zhuo@intel.com are + +queue-4.14/edac-sb_edac-don-t-create-a-second-memory-controller-if-ha1-is-not-present.patch diff --git a/a/content_digest b/N1/content_digest index 27d74f3..93f0d2c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,4 +1,4 @@ - "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" + "From\0<gregkh@linuxfoundation.org>\0" "Subject\0Patch \"EDAC, sb_edac: Don't create a second memory controller if HA1 is not present\" has been added to the 4.14-stable tree\0" "Date\0Wed, 15 Nov 2017 19:02:54 +0100\0" "To\0qiuxu.zhuo@intel.com" @@ -7,10 +7,11 @@ linux-edac@vger.kernel.org tony.luck@intel.com " yizhan@redhat.com\0" - "Cc\0stable@vger.kernel.org" - " stable-commits@vger.kernel.org\0" + "Cc\0<stable@vger.kernel.org>" + " <stable-commits@vger.kernel.org>\0" "\00:1\0" "b\0" + "\n" "This is a note to let you know that I've just added the patch titled\n" "\n" " EDAC, sb_edac: Don't create a second memory controller if HA1 is not present\n" @@ -26,7 +27,7 @@ "please let <stable@vger.kernel.org> know about it.\n" "\n" "\n" - "From 15cc3ae001873845b5d842e212478a6570c7d938 Mon Sep 17 00:00:00 2001\n" + ">From 15cc3ae001873845b5d842e212478a6570c7d938 Mon Sep 17 00:00:00 2001\n" "From: Qiuxu Zhuo <qiuxu.zhuo@intel.com>\n" "Date: Wed, 13 Sep 2017 18:42:14 +0800\n" "Subject: EDAC, sb_edac: Don't create a second memory controller if HA1 is not present\n" @@ -85,20 +86,11 @@ "[ Massage commit message. ]\n" "Signed-off-by: Borislav Petkov <bp@suse.de>\n" "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" + "\n" "---\n" " drivers/edac/sb_edac.c | 9 ++++++++-\n" " 1 file changed, 8 insertions(+), 1 deletion(-)\n" "\n" - "\n" - "\n" - "Patches currently in stable-queue which might be from qiuxu.zhuo@intel.com are\n" - "\n" - "queue-4.14/edac-sb_edac-don-t-create-a-second-memory-controller-if-ha1-is-not-present.patch\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-edac\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - "More majordomo info at http://vger.kernel.org/majordomo-info.html\n" - "\n" "--- a/drivers/edac/sb_edac.c\n" "+++ b/drivers/edac/sb_edac.c\n" "@@ -462,6 +462,7 @@ static const struct pci_id_table pci_dev\n" @@ -130,6 +122,11 @@ "+\t\t}\n" " \n" " \t\tif (dev_descr->dom == SOCK)\n" - " \t\t\tgoto out_imc;" + " \t\t\tgoto out_imc;\n" + "\n" + "\n" + "Patches currently in stable-queue which might be from qiuxu.zhuo@intel.com are\n" + "\n" + queue-4.14/edac-sb_edac-don-t-create-a-second-memory-controller-if-ha1-is-not-present.patch -9392acef075cb24949b49b8bfc7b78264b86fb2878226273d830c3ac2f09f412 +442f35c42f8bd055101120014ff5492ad546ac33e3804db6d633afa8290e2d99
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.