lkml.org 
[lkml]   [2014]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT PULL] trivial for 3.17
From
On Wed, Aug 6, 2014 at 2:37 AM, Jiri Kosina <jkosina@suse.cz> wrote:
>
> You are going to get two conflicts super-easy to resolve:
>
> - arch/arm/mach-msm/Kconfig removal of unused MSM_SCM config value
> conflicts with addition of MSM_TIMER to the same spot; resolution is to
> keep MSM_TIMER and remove MSM_SCM

That's not right. Both MSM_TIMER and MSM_SCM went away.

> - Documentation/laptops/hpfall.c conflict easy to resolve by

Looks correct.

Linus


\
 
 \ /
  Last update: 2014-08-07 06:21    [W:0.039 / U:0.560 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site