diff for duplicates of <20170406212247.GA4723@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 6383969..1d96e1e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,4 +3,4 @@ So during rebase on lastest mmotm one if branch logic got inversed. Attached is a fixup patch. Cheers, -Jerome +Jérôme diff --git a/a/2.txt b/N1/2.txt index 8b13789..ec49576 100644 --- a/a/2.txt +++ b/N1/2.txt @@ -1 +1,24 @@ +>From 374bca39b19a88da1d1c6d38c0a4c49c1af31c18 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse@redhat.com> +Date: Thu, 6 Apr 2017 17:16:56 -0400 +Subject: [PATCH] fixup! mm/hmm/devmem: device memory hotplug using ZONE_DEVICE +--- + mm/hmm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mm/hmm.c b/mm/hmm.c +index ff8ec59..f567a8b 100644 +--- a/mm/hmm.c ++++ b/mm/hmm.c +@@ -898,7 +898,7 @@ static int hmm_devmem_pages_create(struct hmm_devmem *devmem) + ret = arch_add_memory(nid, align_start, align_size, + devmem->pagemap.type); + mem_hotplug_done(); +- if (!ret) ++ if (ret) + goto error_add_memory; + + for (pfn = devmem->pfn_first; pfn < devmem->pfn_last; pfn++) { +-- +2.9.3 diff --git a/a/content_digest b/N1/content_digest index 97e3370..44fdfb7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -21,9 +21,33 @@ "Attached is a fixup patch.\n" "\n" "Cheers,\n" - Jerome + "J\303\251r\303\264me" "\01:2\0" "fn\00001-fixup-mm-hmm-devmem-device-memory-hotplug-using-ZONE.patch\0" "b\0" + ">From 374bca39b19a88da1d1c6d38c0a4c49c1af31c18 Mon Sep 17 00:00:00 2001\n" + "From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse@redhat.com>\n" + "Date: Thu, 6 Apr 2017 17:16:56 -0400\n" + "Subject: [PATCH] fixup! mm/hmm/devmem: device memory hotplug using ZONE_DEVICE\n" + "\n" + "---\n" + " mm/hmm.c | 2 +-\n" + " 1 file changed, 1 insertion(+), 1 deletion(-)\n" + "\n" + "diff --git a/mm/hmm.c b/mm/hmm.c\n" + "index ff8ec59..f567a8b 100644\n" + "--- a/mm/hmm.c\n" + "+++ b/mm/hmm.c\n" + "@@ -898,7 +898,7 @@ static int hmm_devmem_pages_create(struct hmm_devmem *devmem)\n" + " \tret = arch_add_memory(nid, align_start, align_size,\n" + " \t\t\t devmem->pagemap.type);\n" + " \tmem_hotplug_done();\n" + "-\tif (!ret)\n" + "+\tif (ret)\n" + " \t\tgoto error_add_memory;\n" + " \n" + " \tfor (pfn = devmem->pfn_first; pfn < devmem->pfn_last; pfn++) {\n" + "-- \n" + 2.9.3 -82e6d945b90a057a6ee0d090799823d2cdcb8c2a3e3931f0ed76438f3f67e4b1 +1c962e2bbf0bdee79df9b98dbf8815a74510814c6719a092cc0e2491d84dd493
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.