Re: linux-next: manual merge of the tmem tree with the xen-two tree

2012-11-01 Thread Konrad Rzeszutek Wilk
On Fri, Nov 02, 2012 at 12:17:32AM +1100, Stephen Rothwell wrote: > Hi Konrad, > > On Thu, 1 Nov 2012 09:03:10 -0400 Konrad Rzeszutek Wilk > wrote: > > > > I am not really sure how this happen - the 'tmem' tree should not have > > had 7282a68f5aea, and more interestingly, I cannot find it in the

Re: linux-next: manual merge of the tmem tree with the xen-two tree

2012-11-01 Thread Stephen Rothwell
Hi Konrad, On Fri, 2 Nov 2012 00:17:32 +1100 Stephen Rothwell wrote: > > On Thu, 1 Nov 2012 09:03:10 -0400 Konrad Rzeszutek Wilk > wrote: > > > > I am not really sure how this happen - the 'tmem' tree should not have > > had 7282a68f5aea, and more interestingly, I cannot find it in the > > tme

Re: linux-next: manual merge of the tmem tree with the xen-two tree

2012-11-01 Thread Stephen Rothwell
Hi Konrad, On Thu, 1 Nov 2012 09:03:10 -0400 Konrad Rzeszutek Wilk wrote: > > I am not really sure how this happen - the 'tmem' tree should not have > had 7282a68f5aea, and more interestingly, I cannot find it in the > tmem tree! Either way, let me just reset the #linux-next to v3.7-rc3 > in tme

Re: linux-next: manual merge of the tmem tree with the xen-two tree

2012-11-01 Thread Konrad Rzeszutek Wilk
On Thu, Nov 01, 2012 at 02:40:59PM +1100, Stephen Rothwell wrote: > Hi Konrad, > > Today's linux-next merge of the tmem tree got conflicts in > arch/x86/include/asm/xen/interface.h and drivers/xen/cpu_hotplug.c > between commit 6c6067f26388 ("xen/pvh: Extend vcpu_guest_context, p2m, > event, and X