diff for duplicates of <20151014150426.GC21330@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 22d7e77..7f1a925 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ -* Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org> wrote: +* Matt Fleming <matt@codeblueprint.co.uk> wrote: > > So the fix patch is fine as-is for v4.3, but needs a conflict resolution for > > the pending v4.4 commit. @@ -15,7 +15,7 @@ commit of your changes, and documented it all in the merge commit message: commit 790a2ee2427852cff50993c98f15ed88511e9af0 Merge: c7d77a7980e4 0f96a99dab36 -Author: Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +Author: Ingo Molnar <mingo@kernel.org> Date: Wed Oct 14 16:05:40 2015 +0200 Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into core/efi @@ -53,7 +53,7 @@ Date: Wed Oct 14 16:05:40 2015 +0200 I fixed up the interaction in the merge commit, changing the type of current_fb_base from u32 to u64. - Signed-off-by: Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Signed-off-by: Ingo Molnar <mingo@kernel.org> Thanks, diff --git a/a/content_digest b/N1/content_digest index f436f2e..07d96fb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,24 +3,23 @@ "ref\020151014144715.GA17890@gmail.com\0" "ref\020151014145103.GB17890@gmail.com\0" "ref\020151014150215.GC2782@codeblueprint.co.uk\0" - "ref\020151014150215.GC2782-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org\0" - "From\0Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "From\0Ingo Molnar <mingo@kernel.org>\0" "Subject\0Re: [PATCH] x86/efi: Fix multiple GOP device support\0" "Date\0Wed, 14 Oct 2015 17:04:26 +0200\0" - "To\0Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>\0" - "Cc\0Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>" - H. Peter Anvin <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org> + "To\0Matt Fleming <matt@codeblueprint.co.uk>\0" + "Cc\0Thomas Gleixner <tglx@linutronix.de>" + H. Peter Anvin <hpa@zytor.com> " K\305\221v\303\241g\303\263" - " Zolt\303\241n <dirty.ice.hu-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Matthew Garrett <mjg59-1xO5oi07KQx4cg9Nei1l7Q@public.gmane.org> - stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\0" + " Zolt\303\241n <dirty.ice.hu@gmail.com>" + linux-kernel@vger.kernel.org + linux-efi@vger.kernel.org + Matthew Garrett <mjg59@srcf.ucam.org> + stable@vger.kernel.org + " Matt Fleming <matt.fleming@intel.com>\0" "\00:1\0" "b\0" "\n" - "* Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org> wrote:\n" + "* Matt Fleming <matt@codeblueprint.co.uk> wrote:\n" "\n" "> > So the fix patch is fine as-is for v4.3, but needs a conflict resolution for \n" "> > the pending v4.4 commit.\n" @@ -36,7 +35,7 @@ "\n" "commit 790a2ee2427852cff50993c98f15ed88511e9af0\n" "Merge: c7d77a7980e4 0f96a99dab36\n" - "Author: Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + "Author: Ingo Molnar <mingo@kernel.org>\n" "Date: Wed Oct 14 16:05:40 2015 +0200\n" "\n" " Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into core/efi\n" @@ -74,10 +73,10 @@ " I fixed up the interaction in the merge commit, changing the type of\n" " current_fb_base from u32 to u64.\n" " \n" - " Signed-off-by: Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + " Signed-off-by: Ingo Molnar <mingo@kernel.org>\n" "\n" "Thanks,\n" "\n" "\tIngo" -03e3daff0aa11a759197d2a56f400c4604fae43c8605ae9aeaeeade6caaf24e6 +9fe48fbdd731cbecef5ef037b92b95cdcbe79ce9f29fc5fdc5781f68665f1adc
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.