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-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <MWHPR21MB159300D8C1C2DE9F47253097D76C9@MWHPR21MB1593.namprd21.prod.outlook.com>
Date:   Mon, 15 Mar 2021 19:09:49 +0000
From:   Michael Kelley <mikelley@...rosoft.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Wei Liu <wei.liu@...nel.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>
CC:     Borislav Petkov <bp@...e.de>, Juergen Gross <jgross@...e.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: RE: linux-next: manual merge of the hyperv tree with the tip tree

From: Stephen Rothwell <sfr@...b.auug.org.au> Sent: Sunday, March 14, 2021 8:35 PM
> 
> Hi all,
> 
> Today's linux-next merge of the hyperv tree got a conflict in:
> 
>   arch/x86/include/asm/mshyperv.h
> 
> between commit:
> 
>   a0e2bf7cb700 ("x86/paravirt: Switch time pvops functions to use static_call()")
> 
> from the tip tree and commit:
> 
>   eb3e1d370b4c ("clocksource/drivers/hyper-v: Handle sched_clock differences inline")
> 
> from the hyperv tree.
> 
> I fixed it up (I used the latter version of this file and then applied the
> following patch) and can carry the fix as necessary. This is now fixed
> as far as linux-next is concerned, but any non trivial conflicts should
> be mentioned to your upstream maintainer when your tree is submitted for
> merging.  You may also want to consider cooperating with the maintainer
> of the conflicting tree to minimise any particularly complex conflicts.
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Mon, 15 Mar 2021 14:31:07 +1100
> Subject: [PATCH] fix up for "x86/paravirt: Switch time pvops functions to use
>  static_call()"
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/clocksource/hyperv_timer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c
> index ce94f78eb851..1348afc6efbf 100644
> --- a/drivers/clocksource/hyperv_timer.c
> +++ b/drivers/clocksource/hyperv_timer.c
> @@ -490,7 +490,7 @@ static __always_inline void hv_setup_sched_clock(void
> *sched_clock)
>  static __always_inline void hv_setup_sched_clock(void *sched_clock)
>  {
>  	/* We're on x86/x64 *and* using PV ops */
> -	pv_ops.time.sched_clock = sched_clock;
> +	paravirt_set_sched_clock(sched_clock);
>  }
>  #else /* !CONFIG_GENERIC_SCHED_CLOCK && !CONFIG_PARAVIRT */
>  static __always_inline void hv_setup_sched_clock(void *sched_clock) {}
> --
> 2.30.0
> 
> --
> Cheers,
> Stephen Rothwell

Thanks.  That's the correct fix for the conflict.

Michael

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ