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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121101144059.a8350c24499f1beffe59a64a@canb.auug.org.au>
Date:	Thu, 1 Nov 2012 14:40:59 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mukesh Rathor <mukesh.rathor@...cle.com>
Subject: linux-next: manual merge of the tmem tree with the xen-two tree

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@...b.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)  */

Content of type "application/pgp-signature" skipped