Hi, There was actually a problem that the mailer which changed a '\t' to spaces. This is why it conflicted with the tip:x86/apic branch. Any how, I've also tested on the x86/apic branch and everything is ok.
Sent : "[PATCH v2] x86, vsmp: Remove is_vsmp_box() from apic_is_clustered_box()" Sorry for any troubles. Thanks, Oren. On 06/27/2014 08:39 AM, H. Peter Anvin wrote: > On 06/26/2014 10:05 PM, Oren Twaig wrote: >> ping > > This patch conflicts with the changes on the tip:x86/apic branch. Could > you please rebase the patch on top of that branch? > > -hpa > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
