Messages in this thread | | | From | Rusty Russell <> | Subject | Re: linux-next: manual merge of the edac-amd tree with the rr tree | Date | Thu, 19 Nov 2009 17:26:44 +1030 |
| |
On Thu, 19 Nov 2009 04:36:48 pm Borislav Petkov wrote: > Hi Stephen, > > On Thu, Nov 19, 2009 at 04:23:54PM +1100, Stephen Rothwell wrote: > > Today's linux-next merge of the edac-amd tree got a conflict in > > drivers/edac/amd64_edac.c because commit > > 4de1ce0c99ff838090d3b57cab8bc6eeb303dda5 > > ("cpumask:amd64_edac-cpumask_t-remove") from the rr tree and commit > > 2fd9af91b92c10e58993f9eb70300fdff32698fb ("cpumask: use modern cpumask > > style in drivers/edac/amd64_edac.c") from the edac-amd tree are the same > > patch but there are further changes in the edac-amd tree. So, Rusty, I > > guess you can drop that patch (unless something later in the rr tree > > depends on it). > > yes, we agreed I should pick up this patch. Rusty?
Thanks!
Rusty.
| |