diff for duplicates of <20161026122308.235422020@linuxfoundation.org> diff --git a/a/1.txt b/N1/1.txt index c9e2ee7..fdeebc3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -55,9 +55,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (last_type != 0) { new_bios[new_bios_entry].size = change_point[chgidx]->addr - last_addr; - - -_______________________________________________ -Linux-nvdimm mailing list -Linux-nvdimm@lists.01.org -https://lists.01.org/mailman/listinfo/linux-nvdimm diff --git a/a/content_digest b/N1/content_digest index c2bc807..ce33759 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,20 +3,23 @@ "Subject\0[PATCH 4.4 082/112] x86/e820: Dont merge consecutive E820_PRAM ranges\0" "Date\0Wed, 26 Oct 2016 14:23:05 +0200\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Denys Vlasenko <dvlasenk@redhat.com>" - Josh Poimboeuf <jpoimboe@redhat.com> - linux-nvdimm@lists.01.org - Peter Zijlstra <peterz@infradead.org> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - H. Peter Anvin <hpa@zytor.com> - Dave Chinner <david@fromorbit.com> + "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" stable@vger.kernel.org - Ingo Molnar <mingo@kernel.org> - Borislav Petkov <bp@alien8.de> + Dave Chinner <david@fromorbit.com> + Dan Williams <dan.j.williams@intel.com> Andy Lutomirski <luto@kernel.org> + Borislav Petkov <bp@alien8.de> Brian Gerst <brgerst@gmail.com> + Denys Vlasenko <dvlasenk@redhat.com> + H. Peter Anvin <hpa@zytor.com> + Jeff Moyer <jmoyer@redhat.com> + Josh Poimboeuf <jpoimboe@redhat.com> Linus Torvalds <torvalds@linux-foundation.org> - " Thomas Gleixner <tglx@linutronix.de>\0" + Peter Zijlstra <peterz@infradead.org> + Thomas Gleixner <tglx@linutronix.de> + Zhang Yi <yizhan@redhat.com> + linux-nvdimm@ml01.01.org + " Ingo Molnar <mingo@kernel.org>\0" "\00:1\0" "b\0" "4.4-stable review patch. If anyone has any objections, please let me know.\n" @@ -75,12 +78,6 @@ "+\t\tif (current_type != last_type || current_type == E820_PRAM) {\n" " \t\t\tif (last_type != 0)\t {\n" " \t\t\t\tnew_bios[new_bios_entry].size =\n" - " \t\t\t\t\tchange_point[chgidx]->addr - last_addr;\n" - "\n" - "\n" - "_______________________________________________\n" - "Linux-nvdimm mailing list\n" - "Linux-nvdimm@lists.01.org\n" - https://lists.01.org/mailman/listinfo/linux-nvdimm + " \t\t\t\t\tchange_point[chgidx]->addr - last_addr;" -cdf0068ef4d060afc2dc0fc724fae7e720c6e1ffeeeb8bb45e949b0683f2c217 +e43ee68c65418d1b08a35a559670c8a0d43d6f7baa0928737a7248c6f5dbb085
diff --git a/a/1.txt b/N2/1.txt index c9e2ee7..fdeebc3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -55,9 +55,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (last_type != 0) { new_bios[new_bios_entry].size = change_point[chgidx]->addr - last_addr; - - -_______________________________________________ -Linux-nvdimm mailing list -Linux-nvdimm@lists.01.org -https://lists.01.org/mailman/listinfo/linux-nvdimm diff --git a/a/content_digest b/N2/content_digest index c2bc807..97d63b5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,20 +3,23 @@ "Subject\0[PATCH 4.4 082/112] x86/e820: Dont merge consecutive E820_PRAM ranges\0" "Date\0Wed, 26 Oct 2016 14:23:05 +0200\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Denys Vlasenko <dvlasenk@redhat.com>" - Josh Poimboeuf <jpoimboe@redhat.com> - linux-nvdimm@lists.01.org - Peter Zijlstra <peterz@infradead.org> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - H. Peter Anvin <hpa@zytor.com> - Dave Chinner <david@fromorbit.com> + "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" stable@vger.kernel.org - Ingo Molnar <mingo@kernel.org> - Borislav Petkov <bp@alien8.de> + Dave Chinner <david@fromorbit.com> + Dan Williams <dan.j.williams@intel.com> Andy Lutomirski <luto@kernel.org> + Borislav Petkov <bp@alien8.de> Brian Gerst <brgerst@gmail.com> + Denys Vlasenko <dvlasenk@redhat.com> + H. Peter Anvin <hpa@zytor.com> + Jeff Moyer <jmoyer@redhat.com> + Josh Poimboeuf <jpoimboe@redhat.com> Linus Torvalds <torvalds@linux-foundation.org> - " Thomas Gleixner <tglx@linutronix.de>\0" + Peter Zijlstra <peterz@infradead.org> + Thomas Gleixner <tglx@linutronix.de> + Zhang Yi <yizhan@redhat.com> + linux-nvdimm@lists.01.org + " Ingo Molnar <mingo@kernel.org>\0" "\00:1\0" "b\0" "4.4-stable review patch. If anyone has any objections, please let me know.\n" @@ -75,12 +78,6 @@ "+\t\tif (current_type != last_type || current_type == E820_PRAM) {\n" " \t\t\tif (last_type != 0)\t {\n" " \t\t\t\tnew_bios[new_bios_entry].size =\n" - " \t\t\t\t\tchange_point[chgidx]->addr - last_addr;\n" - "\n" - "\n" - "_______________________________________________\n" - "Linux-nvdimm mailing list\n" - "Linux-nvdimm@lists.01.org\n" - https://lists.01.org/mailman/listinfo/linux-nvdimm + " \t\t\t\t\tchange_point[chgidx]->addr - last_addr;" -cdf0068ef4d060afc2dc0fc724fae7e720c6e1ffeeeb8bb45e949b0683f2c217 +6c345230bc94787d9d91a3c377f7b1cb80c020123d926b80948a90580e2c7b37
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.