From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Mar 2021 15:57:50 +0000 (-0700)
Subject: Merge tag 'mips-fixes_5.12_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips... 
X-Git-Tag: v5.15~1463
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2bb25b3a748af6f11df42298e80b9863ed23f2b3;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mips-fixes_5.12_3' of git://git./linux/kernel/git/mips/linux

Pull MIPS fix from Thomas Bogendoerfer:

 - Fix compile error with option MIPS_ELF_APPENDED_DTB

* tag 'mips-fixes_5.12_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: kernel: setup.c: fix compilation error
---

2bb25b3a748af6f11df42298e80b9863ed23f2b3