projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 085bec8 abee210)
Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Dec 2017 01:13:03 +0000 (17:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Dec 2017 01:13:03 +0000 (17:13 -0800)
commita638349bf6c29433b938141f99225b160551ff48
treea13873b0dd2b337d41afd8443d0ec0b0dc186c8atree | snapshot
parent085bec853afdbf3edf1b554defaac606a7e3f0c2commit | diff
parentabee210500ed15a22787009d9210b9a34911afcccommit | diff
Merge branch 'for-4.15-fixes' of git://git./linux/kernel/git/tj/percpu

Pull percpu fix from Tejun Heo:
 "Just one patch to work around CRIS boot problem caused by a recent
  change which freed a temporary boot data structure. The root cause is
  on CRIS side but it doesn't seem trivial to fix. For now, work around
  by skipping freeing on CRIS"

* 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: hack to let the CRIS architecture to boot until they clean up
John Crispins staging tree