linux-next: manual merge of the pm tree with Linus' tree

From: Stephen Rothwell
Date: Sun Oct 28 2018 - 22:01:32 EST

Hi Rafael,

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


between commit:

8508cf3ffad4 ("sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD")

from Linus' tree and commit:

a7fe5190c03f ("cpuidle: menu: Remove get_loadavg() from the performance multiplier")

from the pm 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.

Stephen Rothwell

diff --cc drivers/cpuidle/governors/menu.c
index 71979605246e,76df4f947f07..000000000000
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@@ -130,11 -130,10 +130,6 @@@ struct menu_device
int interval_ptr;

- static inline int get_loadavg(unsigned long load)
- {
- return LOAD_INT(load) * 10 + LOAD_FRAC(load) / 10;
- }
-#define LOAD_INT(x) ((x) >> FSHIFT)
-#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
static inline int which_bucket(unsigned int duration, unsigned long nr_iowaiters)
int bucket = 0;

Attachment: pgpDDgnR3Aa1A.pgp
Description: OpenPGP digital signature