diff for duplicates of <19175.1279886754@redhat.com> diff --git a/a/1.txt b/N1/1.txt index f4fdba5..72651d6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> wrote: +Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Today's linux-next merge of the workqueues tree got a conflict in > fs/cifs/cifsfs.c between commit 4c0c03ca54f72fdd5912516ad0a23ec5cf01bda7 diff --git a/a/content_digest b/N1/content_digest index 2bc5a2c..322678a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,17 @@ "ref\020100723144600.dd4da992.sfr@canb.auug.org.au\0" - "ref\020100723144600.dd4da992.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org\0" - "From\0David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "From\0David Howells <dhowells@redhat.com>\0" "Subject\0Re: linux-next: manual merge of the workqueues tree with the Linus' tree\0" "Date\0Fri, 23 Jul 2010 13:05:54 +0100\0" - "To\0Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>\0" - "Cc\0dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org" - Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - " linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0Stephen Rothwell <sfr@canb.auug.org.au>\0" + "Cc\0dhowells@redhat.com" + Tejun Heo <tj@kernel.org> + linux-next@vger.kernel.org + linux-kernel@vger.kernel.org + Steve French <smfrench@gmail.com> + " linux-cifs@vger.kernel.org\0" "\00:1\0" "b\0" - "Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> wrote:\n" + "Stephen Rothwell <sfr@canb.auug.org.au> wrote:\n" "\n" "> Today's linux-next merge of the workqueues tree got a conflict in\n" "> fs/cifs/cifsfs.c between commit 4c0c03ca54f72fdd5912516ad0a23ec5cf01bda7\n" @@ -28,4 +27,4 @@ "\n" David -2797e504074146e67a0009bf945cabf60b916f1a452f9a17b7c87a5e120f5c63 +d989ec5460b1602518a0012dfd31682311ffcd5738d8dbc18f879748b6ffce84
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.