Merge tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2021 15:56:51 +0000 (05:56 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2021 15:56:51 +0000 (05:56 -1000)
Pull nios2 fix from Dinh Nguyen:

 - Renamed CTL_STATUS to CTL_FSTATUS to fix a redefined warning

* tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  NIOS2: irqflags: rename a redefined register name


Trivial merge