Messages in this thread | | | Date | Wed, 6 Aug 2014 21:05:26 -0700 | Subject | Re: [GIT PULL] trivial for 3.17 | From | Linus Torvalds <> |
| |
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
| |