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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1702 bytes --]

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 XenBus") from the xen-two tree and commit 7282a68f5aea ("PVH:
Basic and preparatory changes") from the tmem tree.

I fixed it up (see below and using the xen-two version for cpu_hotplug.c)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/include/asm/xen/interface.h
index 20e738a,104fa50..0000000
--- a/arch/x86/include/asm/xen/interface.h
+++ b/arch/x86/include/asm/xen/interface.h
@@@ -145,16 -136,8 +145,17 @@@ struct vcpu_guest_context 
      struct cpu_user_regs user_regs;         /* User-level CPU registers     */
      struct trap_info trap_ctxt[256];        /* Virtual IDT                  */
      unsigned long ldt_base, ldt_ents;       /* LDT (linear address, # ents) */
 -    unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents).*
 -					     * PV in HVM: it's GDTR addr/sz */
 +    union {
 +	struct {
- 		/* PV: GDT (machine frames, # ents).*/
++		/* PV: GDT (machine frames, # ents).
++		 * PV in HVM: it's GDTR addr/sz */
 +		unsigned long gdt_frames[16], gdt_ents;
 +	} pv;
 +	struct {
 +		/* PVH: GDTR addr and size */
 +		unsigned long gdtaddr, gdtsz;
 +	} pvh;
 +    } u;
      unsigned long kernel_ss, kernel_sp;     /* Virtual TSS (only SS1/SP1)   */
      /* NB. User pagetable on x86/64 is placed in ctrlreg[1]. */
      unsigned long ctrlreg[8];               /* CR0-CR7 (control registers)  */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[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 XenBus") from the xen-two tree and commit 7282a68f5aea ("PVH:
> Basic and preparatory changes") from the tmem tree.
> 
> I fixed it up (see below and using the xen-two version for cpu_hotplug.c)
> and can carry the fix as necessary (no action is required).

Thank you.

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 tmem tree and see if this shows up.

> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/x86/include/asm/xen/interface.h
> index 20e738a,104fa50..0000000
> --- a/arch/x86/include/asm/xen/interface.h
> +++ b/arch/x86/include/asm/xen/interface.h
> @@@ -145,16 -136,8 +145,17 @@@ struct vcpu_guest_context 
>       struct cpu_user_regs user_regs;         /* User-level CPU registers     */
>       struct trap_info trap_ctxt[256];        /* Virtual IDT                  */
>       unsigned long ldt_base, ldt_ents;       /* LDT (linear address, # ents) */
>  -    unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents).*
>  -					     * PV in HVM: it's GDTR addr/sz */
>  +    union {
>  +	struct {
> - 		/* PV: GDT (machine frames, # ents).*/
> ++		/* PV: GDT (machine frames, # ents).
> ++		 * PV in HVM: it's GDTR addr/sz */
>  +		unsigned long gdt_frames[16], gdt_ents;
>  +	} pv;
>  +	struct {
>  +		/* PVH: GDTR addr and size */
>  +		unsigned long gdtaddr, gdtsz;
>  +	} pvh;
>  +    } u;
>       unsigned long kernel_ss, kernel_sp;     /* Virtual TSS (only SS1/SP1)   */
>       /* NB. User pagetable on x86/64 is placed in ctrlreg[1]. */
>       unsigned long ctrlreg[8];               /* CR0-CR7 (control registers)  */

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 870 bytes --]

Hi Konrad,

On Thu, 1 Nov 2012 09:03:10 -0400 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 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 tmem tree and see if this shows up.

The version of the tmem tree I have has commit a728d5ea1c20 as its head
and has the shortlog below.  I has not changed since Sept 24.

$ git shortlog origin/master..tmem/linux-next 
Konrad Rzeszutek Wilk (3):
      Merge commit 'v3.6-rc5' into linux-next
      Merge branch 'stable/for-linus-3.7' into linux-next
      Merge commit 'v3.6-rc6' into linux-next

Mukesh Rathor (1):
      PVH: Basic and preparatory changes

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

Hi Konrad,

On Fri, 2 Nov 2012 00:17:32 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 1 Nov 2012 09:03:10 -0400 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 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 tmem tree and see if this shows up.
> 
> The version of the tmem tree I have has commit a728d5ea1c20 as its head
> and has the shortlog below.  I has not changed since Sept 24.

Just to be sure, the tmem tree is

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[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 <konrad.wilk@oracle.com> 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 tmem tree and see if this shows up.
> 
> The version of the tmem tree I have has commit a728d5ea1c20 as its head
> and has the shortlog below.  I has not changed since Sept 24.

Oh, my. That is a mistake. I've reseted the #linux-next to be 3.7-rc3
in the tmem tree. It was not suppose to have that patch and I think
I just did 'git am' on the wrong tree. Thanks for catching this!

> 
> $ git shortlog origin/master..tmem/linux-next 
> Konrad Rzeszutek Wilk (3):
>       Merge commit 'v3.6-rc5' into linux-next
>       Merge branch 'stable/for-linus-3.7' into linux-next
>       Merge commit 'v3.6-rc6' into linux-next
> 
> Mukesh Rathor (1):
>       PVH: Basic and preparatory changes
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

Hi Konrad,

Today's linux-next merge of the tmem tree got a conflict in
arch/x86/xen/smp.c between commits 1ba23a0f2605 ("xen/smp: Move the
common CPU init code a bit to prep for PVH patch") and 6c6067f26388
("xen/pvh: Extend vcpu_guest_context, p2m, event, and XenBus") from the
xen-two tree and commit 7282a68f5aea ("PVH: Basic and preparatory
changes") from the tmem tree.

I fixed it up (using the xen-two tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 473 bytes --]

Hi Konrad,

Today's linux-next merge of the tmem tree got a conflict in
arch/x86/xen/setup.c between commit 6056726e851a ("xen/pvh: bootup and
setup (E820) related changes") from the xen-two tree and commit
7282a68f5aea ("PVH: Basic and preparatory changes") from the tmem tree.

I fixed it up (by using the xen-two tree version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

Hi Dan,

Today's linux-next merge of the tmem tree got a conflict in
drivers/xen/Kconfig drivers/xen/tmem.c between commit afec6e04922d ("xen:
prepare tmem shim to handle frontswap") from the xen-two tree and commit
ac33c46b42ba ("xen: enable frontswap for Xen tmem") from the tmem tree.

I just used the xen-two versions of these files (as they look newer).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Konrad Rzeszutek Wilk]

On Wed, Jun 22, 2011 at 02:46:11PM +1000, Stephen Rothwell wrote:
> Hi Dan,
> 
> Today's linux-next merge of the tmem tree got a conflict in
> drivers/xen/Kconfig drivers/xen/tmem.c between commit afec6e04922d ("xen:
> prepare tmem shim to handle frontswap") from the xen-two tree and commit
> ac33c46b42ba ("xen: enable frontswap for Xen tmem") from the tmem tree.
> 

Dan, can you please rebase your #linux-next branch on my #linux-next branch
so that Stephen's awesome build engine can chug along for this?

Thanks!
> I just used the xen-two versions of these files (as they look newer).

OK, we will sort this out.

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

[Konrad Rzeszutek Wilk]

On Wed, Jun 22, 2011 at 02:46:11PM +1000, Stephen Rothwell wrote:
> Hi Dan,
> 
> Today's linux-next merge of the tmem tree got a conflict in
> drivers/xen/Kconfig drivers/xen/tmem.c between commit afec6e04922d ("xen:
> prepare tmem shim to handle frontswap") from the xen-two tree and commit
> ac33c46b42ba ("xen: enable frontswap for Xen tmem") from the tmem tree.
> 

Dan, can you please rebase your #linux-next branch on my #linux-next branch
so that Stephen's awesome build engine can chug along for this?

Thanks!
> I just used the xen-two versions of these files (as they look newer).

OK, we will sort this out.

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

[Dan Magenheimer]

> From: Konrad Rzeszutek Wilk
> Subject: Re: linux-next: manual merge of the tmem tree with the xen-two tree
> 
> On Wed, Jun 22, 2011 at 02:46:11PM +1000, Stephen Rothwell wrote:
> > Hi Dan,
> >
> > Today's linux-next merge of the tmem tree got a conflict in
> > drivers/xen/Kconfig drivers/xen/tmem.c between commit afec6e04922d ("xen:
> > prepare tmem shim to handle frontswap") from the xen-two tree and commit
> > ac33c46b42ba ("xen: enable frontswap for Xen tmem") from the tmem tree.
> 
> Dan, can you please rebase your #linux-next branch on my #linux-next branch
> so that Stephen's awesome build engine can chug along for this?
> 
> Thanks!
> > I just used the xen-two versions of these files (as they look newer).
> 
> OK, we will sort this out.

Should hopefully all be fixed now.  (Konrad's version of the commit is
indeed the newer version so I have removed the older version from the
tmem tree.)

Thanks,
Dan