linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jeremy Fitzhardinge <jeremy@goop.org>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	Xen Devel <Xen-devel@lists.xensource.com>,
	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Andy Lutomirski <luto@kernel.org>,
	Boris Ostrovsky <boris.ostrovsky@oracle.com>,
	David Vrabel <david.vrabel@citrix.com>
Subject: linux-next: manual merge of the xen-tip tree with the tip tree
Date: Wed, 12 Aug 2015 15:09:54 +1000	[thread overview]
Message-ID: <20150812150954.36bc605c@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the xen-tip tree got a conflict in:

  arch/x86/xen/enlighten.c

between commit:

  9261e050b686 ("x86/asm/tsc, x86/paravirt: Remove read_tsc() and read_tscp() paravirt hooks")

from the tip tree and commit:

  cd6f350a5460 ("xen/PMU: Initialization code for Xen PMU")

from the xen-tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc arch/x86/xen/enlighten.c
index d9cfa452da9d,a1c2e46206a9..000000000000
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -1215,8 -1179,11 +1219,8 @@@ static const struct pv_cpu_ops xen_cpu_
  	.read_msr = xen_read_msr_safe,
  	.write_msr = xen_write_msr_safe,
  
- 	.read_pmc = native_read_pmc,
 -	.read_tsc = native_read_tsc,
+ 	.read_pmc = xen_read_pmc,
  
 -	.read_tscp = native_read_tscp,
 -
  	.iret = xen_iret,
  #ifdef CONFIG_X86_64
  	.usergs_sysret32 = xen_sysret32,

             reply	other threads:[~2015-08-12  5:09 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-12  5:09 Stephen Rothwell [this message]
2015-08-12 13:27 ` linux-next: manual merge of the xen-tip tree with the tip tree Boris Ostrovsky
2015-08-12 17:21   ` Peter Zijlstra
2015-08-12 17:38     ` Peter Zijlstra
2015-08-12 17:46     ` Peter Zijlstra
2015-08-12 18:17       ` Boris Ostrovsky
2015-08-12 18:26         ` Andy Lutomirski
2015-08-12 18:30           ` Boris Ostrovsky
2015-08-12 18:26         ` H. Peter Anvin
2015-08-12 18:36           ` Peter Zijlstra
2015-08-12 18:44             ` Boris Ostrovsky
2015-08-12 19:04               ` Peter Zijlstra
2015-08-13  6:45                 ` Ingo Molnar
  -- strict thread matches above, loose matches on Subject: below --
2021-10-28  6:16 Stephen Rothwell
2017-08-31  4:37 Stephen Rothwell
2017-08-31  4:26 Stephen Rothwell
2017-08-31  8:10 ` Thomas Gleixner
2017-08-31  9:00   ` Thomas Gleixner
2017-08-31  9:16     ` Ingo Molnar
2017-08-31 12:36       ` Joe Perches
2017-08-31 10:11     ` Juergen Gross
2017-08-31 12:00       ` Thomas Gleixner
2017-08-31 14:01         ` Boris Ostrovsky
2017-08-31 14:03           ` Juergen Gross
2017-08-31 18:30           ` Thomas Gleixner
2017-08-28  5:20 Stephen Rothwell
2017-08-17  4:03 Stephen Rothwell
2017-06-28  4:21 Stephen Rothwell
2017-04-12  4:30 Stephen Rothwell
2017-04-26  4:57 ` Stephen Rothwell
2017-04-12  4:20 Stephen Rothwell
2017-03-29  3:36 Stephen Rothwell
2017-03-29  3:37 ` Stephen Rothwell
2017-03-29  3:35 Stephen Rothwell
2017-03-29  8:37 ` Juergen Gross
2017-03-29  8:59   ` Ingo Molnar
2017-03-29  9:28     ` Juergen Gross
2017-03-29 10:06       ` Vitaly Kuznetsov
2017-04-03 14:38       ` Ingo Molnar
2017-04-03 14:55         ` Juergen Gross
2017-03-29  9:54     ` Juergen Gross
2017-03-29 10:41       ` Ingo Molnar
2017-03-29 11:13       ` Stephen Rothwell
2016-10-03  1:29 Stephen Rothwell
2016-07-26  4:02 Stephen Rothwell
2016-07-26  4:01 Stephen Rothwell
2016-07-26 13:58 ` Boris Ostrovsky
2016-07-18  6:17 Stephen Rothwell
2016-05-02  4:51 Stephen Rothwell
2016-04-29  4:20 Stephen Rothwell
2014-03-20  4:15 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150812150954.36bc605c@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Xen-devel@lists.xensource.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=david.vrabel@citrix.com \
    --cc=hpa@zytor.com \
    --cc=jeremy@goop.org \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).