[GIT PULL] CRIS for 4.16

[GIT PULL] CRIS for 4.16

[Jesper Nilsson]

Hi Linus!

Please pull the below for the only change I had in the CRIS tree for 4.16.
It looks as there was som breakage in 4.15-rc3 for CRIS, which I'll send
as a separate pull-request based on 4.15 asap.

The following changes since commit bebc6082da0a9f5d47a1ea2edc099bf671058bd4:

  Linux 4.14 (2017-11-12 10:46:13 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git tags/cris-for-4.16

for you to fetch changes up to fd989db807a00d552ebf29d8ffb20c2ef04742da:

  cris: Fix conflicting types for _etext, _edata, _end (2018-01-13 22:42:09 +0100)

----------------------------------------------------------------
CRIS port changes for 4.16

Includes only a small fix for some conflicting symbols, aligning CRIS
with other platforms.

----------------------------------------------------------------
Sergey Senozhatsky (1):
      cris: Fix conflicting types for _etext, _edata, _end

 arch/cris/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- jesper.nilsson@axis.com