diff options
| author | Linus Torvalds | 2018-02-08 10:36:05 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-02-08 10:36:05 -0800 |
| commit | 977e41524dae8fed9c82e3dd298f3b48282fc0b8 (patch) | |
| tree | 5d943ecdbc34e0cf3cdbc2e849497b89045172d7 | |
| parent | 581e400ff935d34d95811258586128bf11baef15 (diff) | |
| parent | fd989db807a00d552ebf29d8ffb20c2ef04742da (diff) | |
| parent | 6e0377212c4e45d7350cff018f6a95633937c031 (diff) | |
Merge tags 'cris-for-4.16' and 'cris-for-4.16-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris
Pull CRIS updates and fixes from Jesper Nilsson:
- a small fix for some conflicting symbols, aligning CRIS with other
platforms.
- fix build breakage regression for all CRIS SoCs. The main Makefile
for the CRIS port was overzealously scrubbed in 4.15-rc3.
* tag 'cris-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
cris: Fix conflicting types for _etext, _edata, _end
* tag 'cris-for-4.16-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
CRIS: Restore mistakenly cleared kernel Makefile