From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Feb 2018 18:36:05 +0000 (-0800)
Subject: Merge tags 'cris-for-4.16' and 'cris-for-4.16-urgent' of git://git.kernel.org/pub... 
X-Git-Tag: v5.15~9435
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=977e41524dae8fed9c82e3dd298f3b48282fc0b8;p=platform%2Fkernel%2Flinux-starfive.git

Merge tags 'cris-for-4.16' and 'cris-for-4.16-urgent' of git://git./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
---

977e41524dae8fed9c82e3dd298f3b48282fc0b8