Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1355921
| From | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the tip tree with the pm tree |
| Date | 2016-03-11 15:00 +0100 |
| Message-ID | <rbvLJ-73L-15@gated-at.bofh.it> (permalink) |
| References | <rbkwV-7et-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Friday, March 11, 2016 12:57:46 PM Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sched/sched.h
>
> between commit:
>
> adaf9fcd1369 ("cpufreq: Move scheduler-related code to the sched directory")
>
> from the pm tree and commit:
>
> e9532e69b8d1 ("sched/cputime: Fix steal time accounting vs. CPU hotplug")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks!
Rafael
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
linux-next: manual merge of the tip tree with the pm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-11 03:00 +0100 Re: linux-next: manual merge of the tip tree with the pm tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-03-11 15:00 +0100
csiph-web