linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Daniel Lezcano <daniel.lezcano@linaro.org>
Subject: linux-next: manual merge of the pm tree with Linus' tree
Date: Mon, 29 Oct 2018 13:01:24 +1100	[thread overview]
Message-ID: <20181029130124.290346e9@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]

Hi Rafael,

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

  drivers/cpuidle/governors/menu.c

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.

-- 
Cheers,
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2018-10-29  2:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-29  2:01 Stephen Rothwell [this message]
2018-10-30  7:33 ` linux-next: manual merge of the pm tree with Linus' tree Rafael J. Wysocki
  -- strict thread matches above, loose matches on Subject: below --
2015-11-08 23:45 Stephen Rothwell
2015-11-09  0:46 ` Rafael J. Wysocki
2015-11-08 23:45 Stephen Rothwell
2014-08-11  1:43 Stephen Rothwell
2014-08-12  1:11 ` Rafael J. Wysocki
2014-08-11  1:41 Stephen Rothwell
2012-05-18  5:48 Stephen Rothwell
2012-05-18 19:08 ` Rafael J. Wysocki

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=20181029130124.290346e9@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=daniel.lezcano@linaro.org \
    --cc=hannes@cmpxchg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    /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).