linux-kernel - linux-next: manual merge of the tip tree with the arm64 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>] [day] [month] [year] [list]

Date:   Tue, 10 Mar 2020 12:49:18 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Ionela Voinescu <ionela.voinescu@....com>,
        Thara Gopinath <thara.gopinath@...aro.org>
Subject: linux-next: manual merge of the tip tree with the arm64 tree

Hi all,

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

  include/linux/arch_topology.h

between commit:

  cd0ed03a8903 ("arm64: use activity monitors for frequency invariance")

from the arm64 tree and commit:

  ad58cc5cc50c ("drivers/base/arch_topology: Add infrastructure to store and update instantaneous thermal pressure")

from the tip tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/arch_topology.h
index 1ccdddb541a7,88a115e81f27..000000000000
--- a/include/linux/arch_topology.h
+++ b/include/linux/arch_topology.h
@@@ -33,8 -33,16 +33,18 @@@ unsigned long topology_get_freq_scale(i
  	return per_cpu(freq_scale, cpu);
  }
  
 +bool arch_freq_counters_available(struct cpumask *cpus);
 +
+ DECLARE_PER_CPU(unsigned long, thermal_pressure);
+ 
+ static inline unsigned long topology_get_thermal_pressure(int cpu)
+ {
+ 	return per_cpu(thermal_pressure, cpu);
+ }
+ 
+ void arch_set_thermal_pressure(struct cpumask *cpus,
+ 			       unsigned long th_pressure);
+ 
  struct cpu_topology {
  	int thread_id;
  	int core_id;

Content of type "application/pgp-signature" skipped